Merge "Clean up compute API image_create"

2 files changed, 6 insertions, 29 deletions

diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 08d9451b3..b79fbd042 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -4383,27 +4383,25 @@ class ComputeAPITestCase(BaseTestCase):
         and min_disk set to that of the original instances flavor.
         """
 
-        self.fake_image['disk_format'] = 'vhd'
+        self.fake_image.update(disk_format='vhd',
+                               min_ram=1, min_disk=1)
         self.stubs.Set(fake_image._FakeImageService, 'show', self.fake_show)
 
-        instance = self._create_fake_instance()
-        inst_params = {'root_gb': 2, 'memory_mb': 256}
-        instance['instance_type'].update(inst_params)
+        instance = self._create_fake_instance(type_name='m1.small')
 
         image = self.compute_api.snapshot(self.context, instance, 'snap1',
                                           {'extra_param': 'value1'})
 
         self.assertEqual(image['name'], 'snap1')
-        self.assertEqual(image['min_ram'], 256)
-        self.assertEqual(image['min_disk'], 2)
+        instance_type = instance['instance_type']
+        self.assertEqual(image['min_ram'], instance_type['memory_mb'])
+        self.assertEqual(image['min_disk'], instance_type['root_gb'])
         properties = image['properties']
         self.assertTrue('backup_type' not in properties)
         self.assertEqual(properties['image_type'], 'snapshot')
         self.assertEqual(properties['instance_uuid'], instance['uuid'])
         self.assertEqual(properties['extra_param'], 'value1')
 
-        db.instance_destroy(self.context, instance['uuid'])
-
     def test_snapshot_minram_mindisk(self):
         """Ensure a snapshots min_ram and min_disk are correct.
 
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index 7df28bfcb..c70e96cdc 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -299,27 +299,6 @@ class DbApiTestCase(test.TestCase):
         self.assertRaises(exception.DuplicateVlan,
                           db.network_create_safe, ctxt, values2)
 
-    def test_instance_test_and_set(self):
-        ctxt = context.get_admin_context()
-        states = [
-            (None, [None, 'some'], 'building'),
-            (None, [None], 'building'),
-            ('building', ['building'], 'ready'),
-            ('building', [None, 'building'], 'ready')]
-        for st in states:
-            inst = db.instance_create(ctxt, {'vm_state': st[0]})
-            uuid = inst['uuid']
-            db.instance_test_and_set(ctxt, uuid, 'vm_state', st[1], st[2])
-            inst = db.instance_get_by_uuid(ctxt, uuid)
-            self.assertEqual(inst["vm_state"], st[2])
-
-    def test_instance_test_and_set_exception(self):
-        ctxt = context.get_admin_context()
-        inst = db.instance_create(ctxt, {'vm_state': 'building'})
-        self.assertRaises(exception.InstanceInvalidState,
-                          db.instance_test_and_set, ctxt,
-                          inst['uuid'], 'vm_state', [None, 'disable'], 'run')
-
     def test_instance_update_with_instance_uuid(self):
         # test instance_update() works when an instance UUID is passed.
         ctxt = context.get_admin_context()