summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2007-11-15 16:25:09 -0500
committerMichael DeHaan <mdehaan@redhat.com>2007-11-15 16:25:09 -0500
commit5cc6b59cefc2cb9375f9dbbe00740d1dca3a4d7c (patch)
tree7c3b6a3da492077a7a3d0e98a98ada1134cc7596 /tests
parent9fc9534aa2d7fe2a3b7d451fd3cdda067a489db9 (diff)
downloadthird_party-cobbler-5cc6b59cefc2cb9375f9dbbe00740d1dca3a4d7c.tar.gz
third_party-cobbler-5cc6b59cefc2cb9375f9dbbe00740d1dca3a4d7c.tar.xz
third_party-cobbler-5cc6b59cefc2cb9375f9dbbe00740d1dca3a4d7c.zip
(a) modify tests to be tolerant of existing directory, (b) modify input engine to know that <<inherit>>
is never going to be a string key, so be sure to not include it in things like kickstart arguments.
Diffstat (limited to 'tests')
-rw-r--r--tests/tests.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/tests.py b/tests/tests.py
index 8f98733..f81d508 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -49,7 +49,10 @@ class BootTest(unittest.TestCase):
# Create temp dir
self.topdir = "/tmp/cobbler_test"
- os.makedirs(self.topdir)
+ try:
+ os.makedirs(self.topdir)
+ except:
+ pass
self.fk_initrd = os.path.join(self.topdir, FAKE_INITRD)
self.fk_initrd2 = os.path.join(self.topdir, FAKE_INITRD2)