Merge "Remove test_instance_update_with_instance_id test"

1 files changed, 0 insertions, 23 deletions

diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index e2420b48f..313de2545 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -214,29 +214,6 @@ class DbApiTestCase(test.TestCase):
         self.assertRaises(exception.DuplicateVlan,
                           db.network_create_safe, ctxt, values2)
 
-    def test_instance_update_with_instance_id(self):
-        """ test instance_update() works when an instance id is passed """
-        ctxt = context.get_admin_context()
-
-        # Create an instance with some metadata
-        values = {'metadata': {'host': 'foo'},
-                  'system_metadata': {'original_image_ref': 'blah'}}
-        instance = db.instance_create(ctxt, values)
-
-        # Update the metadata
-        values = {'metadata': {'host': 'bar'},
-                  'system_metadata': {'original_image_ref': 'baz'}}
-        db.instance_update(ctxt, instance['uuid'], values)
-
-        # Retrieve the user-provided metadata to ensure it was successfully
-        # updated
-        instance_meta = db.instance_metadata_get(ctxt, instance.uuid)
-        self.assertEqual('bar', instance_meta['host'])
-
-        # Retrieve the system metadata to ensure it was successfully updated
-        system_meta = db.instance_system_metadata_get(ctxt, instance.uuid)
-        self.assertEqual('baz', system_meta['original_image_ref'])
-
     def test_instance_update_with_instance_uuid(self):
         """ test instance_update() works when an instance UUID is passed """
         ctxt = context.get_admin_context()