merge with trey tests

2 files changed, 21 insertions, 0 deletions

diff --git a/nova/tests/compute_unittest.py b/nova/tests/compute_unittest.py
index 6f3ef96cb..ad191795c 100644
--- a/nova/tests/compute_unittest.py
+++ b/nova/tests/compute_unittest.py
@@ -139,6 +139,15 @@ class ComputeTestCase(test.TrialTestCase):
         yield self.compute.terminate_instance(self.context, instance_id)
 
     @defer.inlineCallbacks
+    def test_pause(self):
+        """Ensure instance can be paused"""
+        instance_id = self._create_instance()
+        yield self.compute.run_instance(self.context, instance_id)
+        yield self.compute.pause_instance(self.context, instance_id)
+        yield self.compute.unpause_instance(self.context, instance_id)
+        yield self.compute.terminate_instance(self.context, instance_id)
+
+    @defer.inlineCallbacks
     def test_console_output(self):
         """Make sure we can get console output from instance"""
         instance_id = self._create_instance()
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index f855523d3..4526f0042 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -133,6 +133,18 @@ class FakeConnection(object):
         """
         return defer.succeed(None)
 
+    def pause(self, instance):
+        """
+        Pause the specified instance.
+        """
+        return defer.succeed(None)
+
+    def unpause(self, instance):
+        """
+        Unpause the specified instance.
+        """
+        return defer.succeed(None)
+
     def destroy(self, instance):
         """
         Destroy (shutdown and delete) the specified instance.