Revision 2609da63 test/py/ganeti.hypervisor.hv_xen_unittest.py

b/test/py/ganeti.hypervisor.hv_xen_unittest.py
115 115
    self.assertRaises(errors.ProgrammerError, hv._GetCommand, test_hvparams)
116 116

  
117 117

  
118
class TestParseXmList(testutils.GanetiTestCase):
118
class TestParseInstanceList(testutils.GanetiTestCase):
119 119
  def test(self):
120 120
    data = testutils.ReadTestData("xen-xm-list-4.0.1-dom0-only.txt")
121 121

  
122 122
    # Exclude node
123
    self.assertEqual(hv_xen._ParseXmList(data.splitlines(), False), [])
123
    self.assertEqual(hv_xen._ParseInstanceList(data.splitlines(), False), [])
124 124

  
125 125
    # Include node
126
    result = hv_xen._ParseXmList(data.splitlines(), True)
126
    result = hv_xen._ParseInstanceList(data.splitlines(), True)
127 127
    self.assertEqual(len(result), 1)
128 128
    self.assertEqual(len(result[0]), 6)
129 129

  
......
153 153

  
154 154
    for lines in tests:
155 155
      try:
156
        hv_xen._ParseXmList(["Header would be here"] + lines, False)
156
        hv_xen._ParseInstanceList(["Header would be here"] + lines, False)
157 157
      except errors.HypervisorError, err:
158
        self.assertTrue("Can't parse output of xm list" in str(err))
158
        self.assertTrue("Can't parse instance list" in str(err))
159 159
      else:
160 160
        self.fail("Exception was not raised")
161 161

  

Also available in: Unified diff