Remove duplicated test_migrate_disk_and_power_off()

test_migrate_disk_and_power_off() is written exactly twice Partially fix bug 1037183 Change-Id: Ic1f3448d304a5fa64d14fd76a0215c4fb5895774
openstack · Aug 25, 2012 · 29bf91d · 29bf91d
1 parent 982ce57
commit 29bf91d
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
@@ -1039,14 +1039,6 @@ def test_migrate_disk_and_power_off(self):
         conn.migrate_disk_and_power_off(self.context, instance,
                                         '127.0.0.1', instance_type, None)
 
-    def test_migrate_disk_and_power_off(self):
-        instance = db.instance_create(self.context, self.instance_values)
-        xenapi_fake.create_vm(instance.name, 'Running')
-        instance_type = db.instance_type_get_by_name(self.context, 'm1.large')
-        conn = xenapi_conn.XenAPIDriver(False)
-        conn.migrate_disk_and_power_off(self.context, instance,
-                                        '127.0.0.1', instance_type, None)
-
     def test_migrate_disk_and_power_off_passes_exceptions(self):
         instance = db.instance_create(self.context, self.instance_values)
         xenapi_fake.create_vm(instance.name, 'Running')