Revision fac489a5 test/py/ganeti.hypervisor.hv_xen_unittest.py

b/test/py/ganeti.hypervisor.hv_xen_unittest.py
228 228

  
229 229
class TestMergeInstanceInfo(testutils.GanetiTestCase):
230 230
  def testEmpty(self):
231
    self.assertEqual(hv_xen._MergeInstanceInfo({}, lambda _: []), {})
231
    self.assertEqual(hv_xen._MergeInstanceInfo({}, []), {})
232 232

  
233 233
  def _FakeXmList(self, include_node):
234
    self.assertTrue(include_node)
235 234
    return [
236 235
      (hv_xen._DOM0_NAME, NotImplemented, 4096, 7, NotImplemented,
237 236
       NotImplemented),
......
240 239
      ]
241 240

  
242 241
  def testMissingNodeInfo(self):
243
    result = hv_xen._MergeInstanceInfo({}, self._FakeXmList)
242
    instance_list = self._FakeXmList(True)
243
    result = hv_xen._MergeInstanceInfo({}, instance_list)
244 244
    self.assertEqual(result, {
245 245
      "memory_dom0": 4096,
246 246
      "dom0_cpus": 7,
......
248 248

  
249 249
  def testWithNodeInfo(self):
250 250
    info = testutils.ReadTestData("xen-xm-info-4.0.1.txt")
251
    result = hv_xen._GetNodeInfo(info, self._FakeXmList)
251
    instance_list = self._FakeXmList(True)
252
    result = hv_xen._GetNodeInfo(info, instance_list)
252 253
    self.assertEqual(result, {
253 254
      "cpu_nodes": 1,
254 255
      "cpu_sockets": 2,

Also available in: Unified diff