merge prop fixes

1 files changed, 13 insertions, 1 deletions

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 444be5dd8..44d04a12f 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -336,7 +336,7 @@ class ComputeTestCase(test.TestCase):
         self.compute.terminate_instance(context, instance_id)
 
     def test_resize_down_fails(self):
-        """Ensure invalid flavors raise"""
+        """Ensure resizing down raises and fails"""
         context = self.context.elevated()
         instance_id = self._create_instance()
 
@@ -349,6 +349,18 @@ class ComputeTestCase(test.TestCase):
 
         self.compute.terminate_instance(context, instance_id)
 
+    def test_resize_same_size_fails(self):
+        """Ensure invalid flavors raise"""
+        context = self.context.elevated()
+        instance_id = self._create_instance()
+
+        self.compute.run_instance(self.context, instance_id)
+
+        self.assertRaises(exception.ApiError, self.compute_api.resize,
+                context, instance_id, 1)
+
+        self.compute.terminate_instance(context, instance_id)
+
     def test_get_by_flavor_id(self):
         type = instance_types.get_by_flavor_id(1)
         self.assertEqual(type, 'm1.tiny')