Merge lp:~soren/nova/fix-unit-tests into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Fix some unit tests:
 * One is a race due to the polling nature of rpc in eventlet based unit tests.
 * The other is a more real problem. It was caused by datastore.py being removed. It wasn't caught earlier because the .pyc file was still around on the tarmac box.

[Jay Pipes (jaypipes)]

nice catches.

review: Approve

[Eric Day (eday)]

not pretty, but as we discussed in IRC, good for now. :)

review: Approve

[Michael Gundlach (gundlach)]

Maybe we should find . -name *.pyc | xargs rm -rf before we run tarmac
tests?

Michael

On Fri, Oct 15, 2010 at 3:53 PM, Soren Hansen <email address hidden> wrote:

> Soren Hansen has proposed merging lp:~soren/nova/fix-unit-tests into
> lp:nova.
>
> Requested reviews:
> Nova Core (nova-core)
>
>
> Fix some unit tests:
> * One is a race due to the polling nature of rpc in eventlet based unit
> tests.
> * The other is a more real problem. It was caused by datastore.py being
> removed. It wasn't caught earlier because the .pyc file was still around on
> the tarmac box.
> --
> https://code.launchpad.net/~soren/nova/fix-unit-tests/+merge/38587
> Your team Nova Core is requested to review the proposed merge of
> lp:~soren/nova/fix-unit-tests into lp:nova.
>

Confidentiality Notice: This e-mail message (including any attached or
embedded documents) is intended for the exclusive and confidential use of the
individual or entity to which this message is addressed, and unless otherwise
expressly indicated, is confidential and privileged information of Rackspace.
Any dissemination, distribution or copying of the enclosed material is prohibited.
If you receive this transmission in error, please notify us immediately by e-mail
at <email address hidden>, and delete the original message.
Your cooperation is appreciated.

=== modified file 'bin/nova-dhcpbridge'
--- bin/nova-dhcpbridge	2010-10-14 06:44:04 +0000
+++ bin/nova-dhcpbridge	2010-10-15 19:53:40 +0000
@@ -42,7 +42,6 @@
 
 FLAGS = flags.FLAGS
 flags.DECLARE('auth_driver', 'nova.auth.manager')
-flags.DECLARE('redis_db', 'nova.datastore')
 flags.DECLARE('network_size', 'nova.network.manager')
 flags.DECLARE('num_networks', 'nova.network.manager')
 flags.DECLARE('update_dhcp_on_disassociate', 'nova.network.manager')
@@ -100,11 +99,10 @@
     interface = os.environ.get('DNSMASQ_INTERFACE', 'br0')
     if int(os.environ.get('TESTING', '0')):
         FLAGS.fake_rabbit = True
-        FLAGS.redis_db = 8
         FLAGS.network_size = 16
         FLAGS.connection_type = 'fake'
         FLAGS.fake_network = True
-        FLAGS.auth_driver = 'nova.auth.ldapdriver.FakeLdapDriver'
+        FLAGS.auth_driver = 'nova.auth.dbdriver.DbDriver'
         FLAGS.num_networks = 5
         path = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                             '..',
 
=== modified file 'nova/tests/cloud_unittest.py'
--- nova/tests/cloud_unittest.py	2010-10-14 04:42:10 +0000
+++ nova/tests/cloud_unittest.py	2010-10-15 19:53:40 +0000
@@ -26,6 +26,7 @@
 import tempfile
 import time
 
+from eventlet import greenthread
 from twisted.internet import defer
 import unittest
 from xml.etree import ElementTree
@@ -101,6 +102,9 @@
         instance_id = rv['instancesSet'][0]['instanceId']
         output = yield self.cloud.get_console_output(context=self.context, instance_id=[instance_id])
         self.assertEquals(b64decode(output['output']), 'FAKE CONSOLE OUTPUT')
+        # TODO(soren): We need this until we can stop polling in the rpc code
+        #              for unit tests.
+        greenthread.sleep(0.3)
         rv = yield self.cloud.terminate_instances(self.context, [instance_id])