Merge lp:~soren/nova/speedier-test into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Pass a fake timing source to live_migration_pre in every test that expectes it to fail, shaving off a whole minute of test run time.

[Vish Ishaya (vishvananda)]

nice. Faster tests ftw!

review: Approve

[Jesse Andrews (anotherjesse)]

lgtm

review: Approve

[OpenStack Infra (hudson-openstack)]

Attempt to merge into lp:nova failed due to conflicts:

text conflict in nova/virt/libvirt_conn.py

[Soren Hansen (soren)]

Merged trunk. Retrying.

[lp:~soren/nova/speedier-test]

846. By Soren Hansen on 2011-03-24

Merge trunk

=== modified file 'nova/compute/manager.py'
--- nova/compute/manager.py	2011-03-24 08:56:06 +0000
+++ nova/compute/manager.py	2011-03-24 10:00:46 +0000
@@ -42,9 +42,10 @@
 import socket
 import sys
 import tempfile
-import time
 import functools
 
+from eventlet import greenthread
+
 from nova import exception
 from nova import flags
 from nova import log as logging
@@ -844,7 +845,7 @@
 
         return self.driver.update_available_resource(context, self.host)
 
-    def pre_live_migration(self, context, instance_id):
+    def pre_live_migration(self, context, instance_id, time=None):
         """Preparations for live migration at dest host.
 
         :param context: security context
@@ -852,6 +853,9 @@
 
         """
 
+        if not time:
+            time = greenthread
+
         # Getting instance info
         instance_ref = self.db.instance_get(context, instance_id)
         ec2_id = instance_ref['hostname']

=== modified file 'nova/tests/test_compute.py'
--- nova/tests/test_compute.py	2011-03-24 02:00:25 +0000
+++ nova/tests/test_compute.py	2011-03-24 10:00:46 +0000
@@ -44,6 +44,14 @@
 flags.DECLARE('live_migration_retry_count', 'nova.compute.manager')
 
 
+class FakeTime(object):
+    def __init__(self):
+        self.counter = 0
+
+    def sleep(self, t):
+        self.counter += t
+
+
 class ComputeTestCase(test.TestCase):
     """Test case for compute"""
     def setUp(self):
@@ -393,7 +401,7 @@
         self.mox.ReplayAll()
         self.assertRaises(exception.NotFound,
                           self.compute.pre_live_migration,
-                          c, instance_ref['id'])
+                          c, instance_ref['id'], time=FakeTime())
 
     def test_pre_live_migration_instance_has_volume(self):
         """Confirm setup_compute_volume is called when volume is mounted."""
@@ -446,7 +454,7 @@
         self.compute.driver = drivermock
 
         self.mox.ReplayAll()
-        ret = self.compute.pre_live_migration(c, i_ref['id'])
+        ret = self.compute.pre_live_migration(c, i_ref['id'], time=FakeTime())
         self.assertEqual(ret, None)
 
     def test_pre_live_migration_setup_compute_node_fail(self):
@@ -479,7 +487,7 @@
         self.mox.ReplayAll()
         self.assertRaises(exception.ProcessExecutionError,
                           self.compute.pre_live_migration,
-                          c, i_ref['id'])
+                          c, i_ref['id'], time=FakeTime())
 
     def test_live_migration_works_correctly_with_volume(self):
         """Confirm check_for_export to confirm volume health check."""

=== modified file 'nova/tests/test_virt.py'
--- nova/tests/test_virt.py	2011-03-22 15:23:47 +0000
+++ nova/tests/test_virt.py	2011-03-24 10:00:46 +0000
@@ -427,6 +427,15 @@
         def fake_raise(self):
             raise libvirt.libvirtError('ERR')
 
+        class FakeTime(object):
+            def __init__(self):
+                self.counter = 0
+
+            def sleep(self, t):
+                self.counter += t
+
+        fake_timer = FakeTime()
+
         self.create_fake_libvirt_mock(nwfilterLookupByName=fake_raise)
         instance_ref = db.instance_create(self.context, self.test_instance)
 
@@ -436,11 +445,15 @@
             conn = libvirt_conn.LibvirtConnection(False)
             conn.firewall_driver.setattr('setup_basic_filtering', fake_none)
             conn.firewall_driver.setattr('prepare_instance_filter', fake_none)
-            conn.ensure_filtering_rules_for_instance(instance_ref)
+            conn.ensure_filtering_rules_for_instance(instance_ref,
+                                                     time=fake_timer)
         except exception.Error, e:
             c1 = (0 <= e.message.find('Timeout migrating for'))
         self.assertTrue(c1)
 
+        self.assertEqual(29, fake_timer.counter, "Didn't wait the expected "
+                                                 "amount of time")
+
         db.instance_destroy(self.context, instance_ref['id'])
 
     def test_live_migration_raises_exception(self):

=== modified file 'nova/virt/libvirt_conn.py'
--- nova/virt/libvirt_conn.py	2011-03-24 08:56:06 +0000
+++ nova/virt/libvirt_conn.py	2011-03-24 10:00:46 +0000
@@ -42,7 +42,6 @@
 import sys
 import random
 import subprocess
-import time
 import uuid
 from xml.dom import minidom
 
@@ -1172,7 +1171,8 @@
 
         return
 
-    def ensure_filtering_rules_for_instance(self, instance_ref):
+    def ensure_filtering_rules_for_instance(self, instance_ref,
+                                            time=None):
         """Setting up filtering rules and waiting for its completion.
 
         To migrate an instance, filtering rules to hypervisors
@@ -1196,6 +1196,9 @@
 
         """
 
+        if not time:
+            time = greenthread
+
         # If any instances never launch at destination host,
         # basic-filtering must be set here.
         self.firewall_driver.setup_basic_filtering(instance_ref)