diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2006-05-05 17:48:01 -0400 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-05-05 17:48:01 -0400 |
| commit | 8e434ed6574a5b391d9b57f3cbb10f73e62a403c (patch) | |
| tree | 0ccf20785615db6ae452a674959451a77af8eebc /tests/tests.py | |
| parent | 297525dcb3c500d086bb4a5006a5839d98f8522b (diff) | |
| download | third_party-cobbler-8e434ed6574a5b391d9b57f3cbb10f73e62a403c.tar.gz third_party-cobbler-8e434ed6574a5b391d9b57f3cbb10f73e62a403c.tar.xz third_party-cobbler-8e434ed6574a5b391d9b57f3cbb10f73e62a403c.zip | |
Interim commit
Diffstat (limited to 'tests/tests.py')
| -rw-r--r-- | tests/tests.py | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/tests/tests.py b/tests/tests.py index 1db0ba3..e5bcb54 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -80,37 +80,37 @@ class Utilities(BootTest): "Expected: %s; actual: %s" % (expected, actual)) def test_kernel_scan(self): - self.assertTrue(self.api.utils.find_kernel(self.fk_kernel)) - self.assertFalse(self.api.utils.find_kernel("/etc/fstab")) - self.assertFalse(self.api.utils.find_kernel("filedoesnotexist")) - self._expeq(self.fk_kernel, self.api.utils.find_kernel(self.topdir)) + self.assertTrue(utils.find_kernel(self.fk_kernel)) + self.assertFalse(utils.find_kernel("/etc/fstab")) + self.assertFalse(utils.find_kernel("filedoesnotexist")) + self._expeq(self.fk_kernel, utils.find_kernel(self.topdir)) def test_initrd_scan(self): - self.assertTrue(self.api.utils.find_initrd(self.fk_initrd)) - self.assertFalse(self.api.utils.find_kernel("/etc/fstab")) - self.assertFalse(self.api.utils.find_initrd("filedoesnotexist")) - self._expeq(self.fk_initrd, self.api.utils.find_initrd(self.topdir)) + self.assertTrue(utils.find_initrd(self.fk_initrd)) + self.assertFalse(utils.find_kernel("/etc/fstab")) + self.assertFalse(utils.find_initrd("filedoesnotexist")) + self._expeq(self.fk_initrd, utils.find_initrd(self.topdir)) def test_kickstart_scan(self): # we don't check to see if kickstart files look like anything # so this will pass - self.assertTrue(self.api.utils.find_kickstart(self.fk_initrd) is None) - self.assertTrue(self.api.utils.find_kickstart("filedoesnotexist") is None) - self.assertTrue(self.api.utils.find_kickstart(self.topdir) == None) - self.assertTrue(self.api.utils.find_kickstart("http://bar")) - self.assertTrue(self.api.utils.find_kickstart("ftp://bar")) - self.assertTrue(self.api.utils.find_kickstart("nfs://bar")) - self.assertFalse(self.api.utils.find_kickstart("gopher://bar")) + self.assertTrue(utils.find_kickstart(self.fk_initrd) is None) + self.assertTrue(utils.find_kickstart("filedoesnotexist") is None) + self.assertTrue(utils.find_kickstart(self.topdir) == None) + self.assertTrue(utils.find_kickstart("http://bar")) + self.assertTrue(utils.find_kickstart("ftp://bar")) + self.assertTrue(utils.find_kickstart("nfs://bar")) + self.assertFalse(utils.find_kickstart("gopher://bar")) def test_matching(self): - self.assertTrue(self.api.utils.is_mac("00:C0:B7:7E:55:50")) - self.assertFalse(self.api.utils.is_mac("00:c0:b7:7E:55:50")) - self.assertFalse(self.api.utils.is_mac("00.D0.B7.7E.55.50")) - self.assertFalse(self.api.utils.is_mac(self.hostname)) - self.assertTrue(self.api.utils.is_ip("127.0.0.1")) - self.assertTrue(self.api.utils.is_ip("192.168.1.1")) - self.assertFalse(self.api.utils.is_ip("00:C0:B7:7E:55:50")) - self.assertFalse(self.api.utils.is_ip(self.hostname)) + self.assertTrue(utils.is_mac("00:C0:B7:7E:55:50")) + self.assertFalse(utils.is_mac("00:c0:b7:7E:55:50")) + self.assertFalse(utils.is_mac("00.D0.B7.7E.55.50")) + self.assertFalse(utils.is_mac(self.hostname)) + self.assertTrue(utils.is_ip("127.0.0.1")) + self.assertTrue(utils.is_ip("192.168.1.1")) + self.assertFalse(utils.is_ip("00:C0:B7:7E:55:50")) + self.assertFalse(utils.is_ip(self.hostname)) class Additions(BootTest): |