diff options
| author | David Lutterkort <dlutter@redhat.com> | 2006-10-25 10:26:37 -0700 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-10-25 10:26:37 -0700 |
| commit | 1ba62867b46323e6b53b5233be300b4faae2458d (patch) | |
| tree | 6f1b44557338082655e9e0ab3f85604797e65b4b /tests | |
| parent | 679d35e42dfc3ae181167522dc1f171dcf008a84 (diff) | |
| download | third_party-cobbler-1ba62867b46323e6b53b5233be300b4faae2458d.tar.gz third_party-cobbler-1ba62867b46323e6b53b5233be300b4faae2458d.tar.xz third_party-cobbler-1ba62867b46323e6b53b5233be300b4faae2458d.zip | |
Merge 243:1f764e5dd1cc
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tests.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/tests.py b/tests/tests.py index 243934b..e4dc8a3 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -170,25 +170,25 @@ class Additions(BootTest): self.assertTrue(profile.set_kickstart("ftp://bar")) self.assertTrue(profile.set_kickstart("nfs://bar")) - def test_profile_xen_parameter_checking(self): + def test_profile_virt_parameter_checking(self): profile = self.api.new_profile() self.assertTrue(profile.set_name("testprofile12b")) self.assertTrue(profile.set_distro("testdistro0")) self.assertTrue(profile.set_kickstart("http://127.0.0.1/foo")) # no slashes or wildcards in name - self.assertTrue(profile.set_xen_name("xen")) - self.assertTrue(profile.set_xen_name("xen")) - self.failUnlessRaises(CobblerException, profile.set_xen_name, "xen/foo") - self.failUnlessRaises(CobblerException, profile.set_xen_name, "xen*foo") - self.failUnlessRaises(CobblerException, profile.set_xen_name, "xen?foo") + self.assertTrue(profile.set_virt_name("virt")) + self.assertTrue(profile.set_virt_name("virt")) + self.failUnlessRaises(CobblerException, profile.set_virt_name, "virt/foo") + self.failUnlessRaises(CobblerException, profile.set_virt_name, "virt*foo") + self.failUnlessRaises(CobblerException, profile.set_virt_name, "virt?foo") # sizes must be integers - self.assertTrue(profile.set_xen_file_size("54321")) + self.assertTrue(profile.set_virt_file_size("54321")) # temporarily commenting out failing test - # self.failUnlessRaises(CobblerException, profile.set_xen_file_size, "huge") - # self.failUnlessRaises(CobblerException, profile.set_xen_file_size, "54321.23") + # self.failUnlessRaises(CobblerException, profile.set_virt_file_size, "huge") + # self.failUnlessRaises(CobblerException, profile.set_virt_file_size, "54321.23") # paravirt must be 'true' or 'false' - self.assertTrue(profile.set_xen_paravirt(False)) - self.assertTrue(profile.set_xen_paravirt(True)) + self.assertTrue(profile.set_virt_paravirt(False)) + self.assertTrue(profile.set_virt_paravirt(True)) self.assertTrue(self.api.profiles().add(profile)) def test_invalid_system_bad_name_host(self): @@ -307,11 +307,11 @@ class TestImport(BootTest): # below: # partial name of distro: current count, passing count, required arch haystacks = { - "import_testdata/RHEL-4/U4/AS/ia64/tree/images/pxeboot" : [0, 1, "ia64" ], - "import_testdata/RHEL-4/U4/AS/i386/tree/images/pxeboot" : [0, 1, "x86" ], - "import_testdata/RHEL-4/U4/AS/x86_64/tree/images/pxeboot" : [0, 1, "x86_64" ], - "import_testdata/core/5/i386/os/images/pxeboot" : [ 0, 1, "x86" ], - "import_testdata/core/5/i386/os/images/xen" : [0, 1, "x86" ], + "import_testdata_RHEL-4_U4_AS_ia64_tree_images_pxeboot" : [0, 1, "ia64" ], + "import_testdata_RHEL-4_U4_AS_i386_tree_images_pxeboot" : [0, 1, "x86" ], + "import_testdata_RHEL-4_U4_AS_x86_64_tree_images_pxeboot" : [0, 1, "x86_64" ], + "import_testdata_core_5_i386_os_images_pxeboot" : [ 0, 1, "x86" ], + "import_testdata_core_5_i386_os_images_xen" : [0, 1, "x86" ], } # first go through all found distros and count the matches |