Revision 00ef625c test/py/ganeti.hypervisor.hv_kvm_unittest.py

b/test/py/ganeti.hypervisor.hv_kvm_unittest.py
248 248
class TestVersionChecking(testutils.GanetiTestCase):
249 249
  def testParseVersion(self):
250 250
    parse = hv_kvm.KVMHypervisor._ParseKVMVersion
251
    help_112 = utils.ReadFile(self._TestDataFilename("kvm_1.1.2_help.txt"))
252
    help_10 = utils.ReadFile(self._TestDataFilename("kvm_1.0_help.txt"))
253
    help_01590 = utils.ReadFile(self._TestDataFilename("kvm_0.15.90_help.txt"))
254
    help_0125 = utils.ReadFile(self._TestDataFilename("kvm_0.12.5_help.txt"))
255
    help_091 = utils.ReadFile(self._TestDataFilename("kvm_0.9.1_help.txt"))
251
    help_112 = testutils.ReadTestData("kvm_1.1.2_help.txt")
252
    help_10 = testutils.ReadTestData("kvm_1.0_help.txt")
253
    help_01590 = testutils.ReadTestData("kvm_0.15.90_help.txt")
254
    help_0125 = testutils.ReadTestData("kvm_0.12.5_help.txt")
255
    help_091 = testutils.ReadTestData("kvm_0.9.1_help.txt")
256 256
    self.assertEqual(parse(help_112), ("1.1.2", 1, 1, 2))
257 257
    self.assertEqual(parse(help_10), ("1.0", 1, 0, 0))
258 258
    self.assertEqual(parse(help_01590), ("0.15.90", 0, 15, 90))
......
300 300

  
301 301
    """
302 302
    boot_re = hv_kvm.KVMHypervisor._BOOT_RE
303
    help_112 = utils.ReadFile(self._TestDataFilename("kvm_1.1.2_help.txt"))
304
    help_10 = utils.ReadFile(self._TestDataFilename("kvm_1.0_help.txt"))
305
    help_01590 = utils.ReadFile(self._TestDataFilename("kvm_0.15.90_help.txt"))
306
    help_0125 = utils.ReadFile(self._TestDataFilename("kvm_0.12.5_help.txt"))
307
    help_091 = utils.ReadFile(self._TestDataFilename("kvm_0.9.1_help.txt"))
308
    help_091_fake = utils.ReadFile(
309
      self._TestDataFilename("kvm_0.9.1_help_boot_test.txt"))
303
    help_112 = testutils.ReadTestData("kvm_1.1.2_help.txt")
304
    help_10 = testutils.ReadTestData("kvm_1.0_help.txt")
305
    help_01590 = testutils.ReadTestData("kvm_0.15.90_help.txt")
306
    help_0125 = testutils.ReadTestData("kvm_0.12.5_help.txt")
307
    help_091 = testutils.ReadTestData("kvm_0.9.1_help.txt")
308
    help_091_fake = testutils.ReadTestData("kvm_0.9.1_help_boot_test.txt")
310 309

  
311 310
    self.assertTrue(boot_re.search(help_091))
312 311
    self.assertTrue(boot_re.search(help_0125))

Also available in: Unified diff