diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-10-15 23:59:23 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-10-15 23:59:23 +0200 |
| commit | b4ac1ddbfa0607bb75a187680b8d55006c6ea0c0 (patch) | |
| tree | 5b0a2e5a0d68205ad8ffdf8794be08a20af1e049 | |
| parent | 5bb507fc0375e0e4dc7b8448b6751dcc52fc75eb (diff) | |
| parent | 3b34b9f64c2f27cdc6203f8d5571246a92aa4386 (diff) | |
| download | nova-b4ac1ddbfa0607bb75a187680b8d55006c6ea0c0.tar.gz nova-b4ac1ddbfa0607bb75a187680b8d55006c6ea0c0.tar.xz nova-b4ac1ddbfa0607bb75a187680b8d55006c6ea0c0.zip | |
Merge trunk
| -rwxr-xr-x | bin/nova-dhcpbridge | 4 | ||||
| -rw-r--r-- | nova/api/openstack/backup_schedules.py | 2 | ||||
| -rw-r--r-- | nova/tests/cloud_unittest.py | 4 |
3 files changed, 6 insertions, 4 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/api/openstack/backup_schedules.py b/nova/api/openstack/backup_schedules.py index 76ad6ef87..db240c65a 100644 --- a/nova/api/openstack/backup_schedules.py +++ b/nova/api/openstack/backup_schedules.py @@ -34,5 +34,5 @@ class Controller(wsgi.Controller): both create and update through a POST """ return faults.Fault(exc.HTTPNotFound()) - def delete(self, req, server_id): + def delete(self, req, server_id, id): return faults.Fault(exc.HTTPNotFound()) 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]) |