Revision 6b27f535 test/ganeti.masterd.instance_unittest.py

b/test/ganeti.masterd.instance_unittest.py
31 31
from ganeti import masterd
32 32

  
33 33
from ganeti.masterd.instance import \
34
  ImportExportTimeouts, _TimeoutExpired, _DiskImportExportBase, \
34
  ImportExportTimeouts, _DiskImportExportBase, \
35 35
  ComputeRemoteExportHandshake, CheckRemoteExportHandshake, \
36 36
  ComputeRemoteImportDiskInfo, CheckRemoteExportDiskInfo, \
37 37
  FormatProgress
......
60 60
    self.assertEqual(tmo.progress, 5)
61 61

  
62 62
  def testTimeoutExpired(self):
63
    self.assert_(_TimeoutExpired(100, 300, _time_fn=lambda: 500))
64
    self.assertFalse(_TimeoutExpired(100, 300, _time_fn=lambda: 0))
65
    self.assertFalse(_TimeoutExpired(100, 300, _time_fn=lambda: 100))
66
    self.assertFalse(_TimeoutExpired(100, 300, _time_fn=lambda: 400))
63
    self.assert_(utils.TimeoutExpired(100, 300, _time_fn=lambda: 500))
64
    self.assertFalse(utils.TimeoutExpired(100, 300, _time_fn=lambda: 0))
65
    self.assertFalse(utils.TimeoutExpired(100, 300, _time_fn=lambda: 100))
66
    self.assertFalse(utils.TimeoutExpired(100, 300, _time_fn=lambda: 400))
67 67

  
68 68
  def testDiskImportExportBaseDirect(self):
69 69
    self.assertRaises(AssertionError, _DiskImportExportBase,

Also available in: Unified diff