diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-10-15 20:23:59 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-10-15 20:23:59 +0000 |
| commit | d4d8a530036d1530ba5420fb3831bc0705a604e8 (patch) | |
| tree | c35cdc762faeede856ddc1678d344408393fb84d | |
| parent | b70742cd442e8477d15c82a825641d934529bedf (diff) | |
| parent | a2eec045eec52032ae8a3250120229039529ec53 (diff) | |
| download | nova-d4d8a530036d1530ba5420fb3831bc0705a604e8.tar.gz nova-d4d8a530036d1530ba5420fb3831bc0705a604e8.tar.xz nova-d4d8a530036d1530ba5420fb3831bc0705a604e8.zip | |
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.
| -rwxr-xr-x | bin/nova-dhcpbridge | 4 | ||||
| -rw-r--r-- | nova/tests/cloud_unittest.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index 2b7a083d2..ffb752ae8 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -42,7 +42,6 @@ from nova.network import linux_net 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 @@ def main(): 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__), '..', diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py index 20099069c..835bfdf49 100644 --- a/nova/tests/cloud_unittest.py +++ b/nova/tests/cloud_unittest.py @@ -26,6 +26,7 @@ import StringIO import tempfile import time +from eventlet import greenthread from twisted.internet import defer import unittest from xml.etree import ElementTree @@ -101,6 +102,9 @@ class CloudTestCase(test.TrialTestCase): 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]) |