diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-28 23:41:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-28 23:41:54 +0000 |
| commit | 2b7583bc4d1b5673b89e1613e39dba1245f62778 (patch) | |
| tree | 98dfa7bfa982f2d84210de28cde1bee739e18e73 | |
| parent | 0c618982f790cca34729ef3fcd001e566a15de8d (diff) | |
| parent | 158ff36a8770794dcac00966a0e1adaa5f0996b1 (diff) | |
Merge "Fixes HyperV compute "resume" tests"
| -rw-r--r-- | nova/tests/test_hypervapi.py | 10 |
1 files 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): |