diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-10-18 22:05:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-10-18 22:05:07 +0000 |
| commit | 926ec59983704f3e4c8527e5e479a0cb12acbf96 (patch) | |
| tree | 6c64e134af573331d71294218b81ac0771edfb9a | |
| parent | f0125d26ef773a489e4b924bcaa1195610ef6026 (diff) | |
| parent | 4eeb0b96fcd37b6ec8a3e6c2db22e014b326b9c2 (diff) | |
Merge "Chain up to superclass tearDown in ServerActionsTest"
| -rw-r--r-- | nova/tests/api/openstack/test_server_actions.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_hosts.py | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/nova/tests/api/openstack/test_server_actions.py b/nova/tests/api/openstack/test_server_actions.py index 2f1b6d11e..95e75015b 100644 --- a/nova/tests/api/openstack/test_server_actions.py +++ b/nova/tests/api/openstack/test_server_actions.py @@ -136,6 +136,7 @@ class ServerActionsTest(test.TestCase): def tearDown(self): self.stubs.UnsetAll() + super(ServerActionsTest, self).tearDown() def test_server_bad_body(self): body = {} diff --git a/nova/tests/test_hosts.py b/nova/tests/test_hosts.py index a724db9da..becc74cdd 100644 --- a/nova/tests/test_hosts.py +++ b/nova/tests/test_hosts.py @@ -94,14 +94,17 @@ class HostTestCase(test.TestCase): self.assertEqual(result_c2["status"], "disabled") def test_host_startup(self): + self.flags(allow_admin_api=True) result = self.controller.startup(self.req, "host_c1") self.assertEqual(result["power_action"], "startup") def test_host_shutdown(self): + self.flags(allow_admin_api=True) result = self.controller.shutdown(self.req, "host_c1") self.assertEqual(result["power_action"], "shutdown") def test_host_reboot(self): + self.flags(allow_admin_api=True) result = self.controller.reboot(self.req, "host_c1") self.assertEqual(result["power_action"], "reboot") |