diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-06-25 14:58:20 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-06-25 14:58:20 -0400 |
| commit | 1e7b1b8ba5a982ca801a4d8246934a2315dd5931 (patch) | |
| tree | eb9138807fdb1b68143ac7bcf89828b2e8c3d003 /tests | |
| parent | 449e841102ab32c88c3559b92069ba648bd61a8d (diff) | |
| download | third_party-cobbler-1e7b1b8ba5a982ca801a4d8246934a2315dd5931.tar.gz third_party-cobbler-1e7b1b8ba5a982ca801a4d8246934a2315dd5931.tar.xz third_party-cobbler-1e7b1b8ba5a982ca801a4d8246934a2315dd5931.zip | |
Remove references to manage_dhcp_mode and manage_dns_mode as this is governed by modules.conf, and rewrite the restart-services trigger to understand restart_dhcp and restart_dns variables, which are now mentioned in the settings file. Also, clean up the tests so they work more nicely on F9, and remove some unused lines from the Makefile.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tests.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/tests.py b/tests/tests.py index 02d53be..7c4c6bf 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -741,7 +741,11 @@ class SyncContents(BootTest): converted="01-bb-ee-ee-ee-ee-ff" - fh = open("/tftpboot/pxelinux.cfg/%s" % converted) + if os.path.exists("/var/lib/tftpboot"): + fh = open("/var/lib/tftpboot/pxelinux.cfg/%s" % converted) + else: + fh = open("/tftpboot/pxelinux.cfg/%s" % converted) + data = fh.read() self.assertTrue(data.find("/op/ks/") != -1) fh.close() @@ -751,7 +755,10 @@ class SyncContents(BootTest): # (which was an error we had in 0.6.3) self.api.sync() - fh = open("/tftpboot/pxelinux.cfg/%s" % converted) + if os.path.exists("/var/lib/tftpboot"): + fh = open("/var/lib/tftpboot/pxelinux.cfg/%s" % converted) + else: + fh = open("/tftpboot/pxelinux.cfg/%s" % converted) data = fh.read() self.assertTrue(data.find("/op/ks/") != -1) fh.close() |