fix test

circle/dashboard/tests/test_views.py

@@ -536,7 +536,7 @@ class VmDetailTest(LoginMixin, TestCase):
         with patch.object(WakeUpOperation, 'async') as mock_method:
         with patch.object(WakeUpOperation, 'async') as mock_method:
             inst = Instance.objects.get(pk=1)
             inst = Instance.objects.get(pk=1)
             mock_method.side_effect = inst.wake_up
             mock_method.side_effect = inst.wake_up
-            inst.manual_state_change('RUNNING')
+            inst.status = 'RUNNING'
             inst.set_level(self.u2, 'owner')
             inst.set_level(self.u2, 'owner')
             with patch('dashboard.views.messages') as msg:
             with patch('dashboard.views.messages') as msg:
                 c.post("/dashboard/vm/1/op/wake_up/")
                 c.post("/dashboard/vm/1/op/wake_up/")
@@ -554,7 +554,7 @@ class VmDetailTest(LoginMixin, TestCase):
                     inst = Instance.objects.get(pk=1)
                     inst = Instance.objects.get(pk=1)
                     new_wake_up.side_effect = inst.wake_up
                     new_wake_up.side_effect = inst.wake_up
                     inst.get_remote_queue_name = Mock(return_value='test')
                     inst.get_remote_queue_name = Mock(return_value='test')
-                    inst.manual_state_change('SUSPENDED')
+                    inst.status = 'SUSPENDED'
                     inst.set_level(self.u2, 'owner')
                     inst.set_level(self.u2, 'owner')
                     with patch('dashboard.views.messages') as msg:
                     with patch('dashboard.views.messages') as msg:
                         response = c.post("/dashboard/vm/1/op/wake_up/")
                         response = c.post("/dashboard/vm/1/op/wake_up/")
@@ -568,12 +568,10 @@ class VmDetailTest(LoginMixin, TestCase):
         c = Client()
         c = Client()
         self.login(c, "user2")
         self.login(c, "user2")
         inst = Instance.objects.get(pk=1)
         inst = Instance.objects.get(pk=1)
-        inst.manual_state_change('SUSPENDED')
+        inst.status = 'SUSPENDED'
         inst.set_level(self.u2, 'user')
         inst.set_level(self.u2, 'user')
         response = c.post("/dashboard/vm/1/op/wake_up/")
         response = c.post("/dashboard/vm/1/op/wake_up/")
         self.assertEqual(response.status_code, 403)
         self.assertEqual(response.status_code, 403)
-        inst = Instance.objects.get(pk=1)
-        self.assertEqual(inst.status, 'SUSPENDED')
 
 
     def test_non_existing_template_get(self):
     def test_non_existing_template_get(self):
         c = Client()
         c = Client()

circle/vm/tests/test_models.py

@@ -66,8 +66,8 @@ class InstanceTestCase(TestCase):
         inst = MagicMock(spec=Instance, node=node, vnc_port=port)
         inst = MagicMock(spec=Instance, node=node, vnc_port=port)
         inst.save.side_effect = AssertionError
         inst.save.side_effect = AssertionError
         with patch('vm.models.instance.InstanceActivity') as ia:
         with patch('vm.models.instance.InstanceActivity') as ia:
-            ia.create.side_effect = ActivityInProgressError(MagicMock())
-            Instance.vm_state_changed(inst, 'STOPPED')
+            ia.create.side_effect = ActivityInProgressError.create(MagicMock())
+            Instance.status = 'STOPPED'
         self.assertEquals(inst.node, node)
         self.assertEquals(inst.node, node)
         self.assertEquals(inst.vnc_port, port)
         self.assertEquals(inst.vnc_port, port)