summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2010-12-29 21:16:53 -0600
committerTrey Morris <trey.morris@rackspace.com>2010-12-29 21:16:53 -0600
commit2515d8ee9e32e0658b6179e900cf2e0e87a032dc (patch)
treeead0803aba6286b9daaa0cd4820fefaf3e687a49
parent656233762a61929d43f671e4765d52f25299562f (diff)
fixed up the compute lock test, was failing because the context was always admin
-rw-r--r--nova/tests/test_compute.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 422d59da0..f914294f0 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -175,15 +175,15 @@ class ComputeTestCase(test.TestCase):
"""ensure locked instance cannot be changed"""
instance_id = self._create_instance()
self.compute.run_instance(self.context, instance_id)
- self.compute.pause_instance(self.context, instance_id)
self.compute.lock_instance(self.context, instance_id)
+ non_admin_context = context.RequestContext(None, None, False, False)
# pause should raise exception on locked instance
- self.assertRaises(Exception, self.compute.unpause_instance,
- self.context, instance_id)
+ self.assertRaises(Exception, self.compute.reboot_instance,
+ non_admin_context, instance_id)
# test will fail if exception is raised
self.compute.unlock_instance(self.context, instance_id)
- self.compute.unpause_instance(self.context, instance_id)
+ self.compute.reboot_instance(non_admin_context, instance_id)
self.compute.terminate_instance(self.context, instance_id)