Revision 1a2e7fe9 test/ganeti.masterd.instance_unittest.py

b/test/ganeti.masterd.instance_unittest.py
33 33
from ganeti.masterd.instance import \
34 34
  ImportExportTimeouts, _TimeoutExpired, _DiskImportExportBase, \
35 35
  ComputeRemoteExportHandshake, CheckRemoteExportHandshake, \
36
  ComputeRemoteImportDiskInfo, CheckRemoteExportDiskInfo
36
  ComputeRemoteImportDiskInfo, CheckRemoteExportDiskInfo, \
37
  FormatProgress
37 38

  
38 39
import testutils
39 40

  
......
45 46
    self.assertEqual(tmo.listen, ImportExportTimeouts.DEFAULT_LISTEN_TIMEOUT)
46 47
    self.assertEqual(tmo.ready, ImportExportTimeouts.DEFAULT_READY_TIMEOUT)
47 48
    self.assertEqual(tmo.error, ImportExportTimeouts.DEFAULT_ERROR_TIMEOUT)
49
    self.assertEqual(tmo.progress,
50
                     ImportExportTimeouts.DEFAULT_PROGRESS_INTERVAL)
48 51

  
49 52
    tmo = ImportExportTimeouts(999)
50 53
    self.assertEqual(tmo.connect, 999)
51 54

  
55
    tmo = ImportExportTimeouts(1, listen=2, error=3, ready=4, progress=5)
56
    self.assertEqual(tmo.connect, 1)
57
    self.assertEqual(tmo.listen, 2)
58
    self.assertEqual(tmo.error, 3)
59
    self.assertEqual(tmo.ready, 4)
60
    self.assertEqual(tmo.progress, 5)
61

  
52 62
  def testTimeoutExpired(self):
53 63
    self.assert_(_TimeoutExpired(100, 300, _time_fn=lambda: 500))
54 64
    self.assertFalse(_TimeoutExpired(100, 300, _time_fn=lambda: 0))
......
119 129
                      cds, 0, ("nodeX", 123, "fakehash", "xyz"))
120 130

  
121 131

  
132
class TestFormatProgress(unittest.TestCase):
133
  def test(self):
134
    FormatProgress((0, 0, None, None))
135
    FormatProgress((100, 3.3, 30, None))
136
    FormatProgress((100, 3.3, 30, 900))
137

  
138
    self.assertEqual(FormatProgress((1500, 12, 30, None)),
139
                     "1.5G, 12.0 MiB/s, 30%")
140

  
141

  
122 142
if __name__ == "__main__":
123 143
  testutils.GanetiTestProgram()

Also available in: Unified diff