From 158ff36a8770794dcac00966a0e1adaa5f0996b1 Mon Sep 17 00:00:00 2001 From: Alessandro Pilotti Date: Thu, 29 Nov 2012 00:40:17 +0200 Subject: Fixes HyperV compute "resume" tests Fixes Bug #1083018 Adds support for the extra parameter added in the compute driver's resume method. The added network_info parameter is currently not used and can safely be set to None. Change-Id: I887d48f39601323433384833f8b8d33132858b59 --- nova/tests/test_hypervapi.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/nova/tests/test_hypervapi.py b/nova/tests/test_hypervapi.py index 6948e235b..4fe09894a 100644 --- a/nova/tests/test_hypervapi.py +++ b/nova/tests/test_hypervapi.py @@ -275,19 +275,13 @@ class HyperVAPITestCase(basetestcase.BaseTestCase): constants.HYPERV_VM_STATE_SUSPENDED, constants.HYPERV_VM_STATE_SUSPENDED) - # NOTE (rmk): Resume now takes 3 mandatory args. These tests need to - # be updated but cannot be without involvement from the maintainers - # of the HyperV driver/tests. def test_resume(self): - self.skipTest("Requires updating.") - self._test_vm_state_change(self._conn.resume, + self._test_vm_state_change(lambda i: self._conn.resume(i, None), constants.HYPERV_VM_STATE_SUSPENDED, constants.HYPERV_VM_STATE_ENABLED) - # NOTE: (rmk): See comment for test_resume(). def test_resume_already_running(self): - self.skipTest("Requires updating.") - self._test_vm_state_change(self._conn.resume, None, + self._test_vm_state_change(lambda i: self._conn.resume(i, None), None, constants.HYPERV_VM_STATE_ENABLED) def test_power_off(self): -- cgit