add carrot/kombu tests... small thread fix for kombu

4 files changed, 13 insertions, 13 deletions

diff --git a/nova/rpc/__init__.py b/nova/rpc/__init__.py
index 10b69c8b5..2a47ba87b 100644
--- a/nova/rpc/__init__.py
+++ b/nova/rpc/__init__.py
@@ -23,7 +23,7 @@ from nova import flags
 
 FLAGS = flags.FLAGS
 flags.DEFINE_string('rpc_backend',
-                    'carrot',
+                    'kombu',
                     "The messaging module to use, defaults to carrot.")
 
 impl_table = {'kombu': 'nova.rpc.impl_kombu',
@@ -42,7 +42,7 @@ def create_connection(new=True):
 
 
 def create_consumer(conn, topic, proxy, fanout=False):
-    return RPCIMPL.create_consumer(conn, topic, proxy, fanout)
+    RPCIMPL.create_consumer(conn, topic, proxy, fanout)
 
 
 def call(context, topic, msg):
diff --git a/nova/rpc/common.py b/nova/rpc/common.py
index 1d3065a83..b8c280630 100644
--- a/nova/rpc/common.py
+++ b/nova/rpc/common.py
@@ -1,8 +1,14 @@
 from nova import exception
+from nova import flags
 from nova import log as logging
 
 LOG = logging.getLogger('nova.rpc')
 
+flags.DEFINE_integer('rpc_thread_pool_size', 1024,
+                             'Size of RPC thread pool')
+flags.DEFINE_integer('rpc_conn_pool_size', 30,
+                             'Size of RPC connection pool')
+
 
 class RemoteError(exception.Error):
     """Signifies that a remote class has raised an exception.
diff --git a/nova/rpc/impl_carrot.py b/nova/rpc/impl_carrot.py
index efff788a0..07af0a116 100644
--- a/nova/rpc/impl_carrot.py
+++ b/nova/rpc/impl_carrot.py
@@ -49,10 +49,6 @@ from nova.rpc.common import RemoteError, LOG
 eventlet.monkey_patch()
 
 FLAGS = flags.FLAGS
-flags.DEFINE_integer('rpc_thread_pool_size', 1024,
-                     'Size of RPC thread pool')
-flags.DEFINE_integer('rpc_conn_pool_size', 30,
-                     'Size of RPC connection pool')
 
 
 class Connection(carrot_connection.BrokerConnection):
diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py
index bd83bc520..49bca1d81 100644
--- a/nova/rpc/impl_kombu.py
+++ b/nova/rpc/impl_kombu.py
@@ -40,11 +40,6 @@ eventlet.monkey_patch()
 
 FLAGS = flags.FLAGS
 
-flags.DEFINE_integer('rpc_conn_pool_size', 30,
-                     'Size of RPC connection pool')
-flags.DEFINE_integer('rpc_thread_pool_size', 1024,
-                     'Size of RPC thread pool')
-
 
 class ConsumerBase(object):
     """Consumer base class."""
@@ -328,6 +323,9 @@ class Connection(object):
                 pass
             time.sleep(1)
         self.connection = kombu.connection.Connection(**self.params)
+        if FLAGS.fake_rabbit:
+            # Kludge to speed up tests.
+            self.connection.transport.polling_interval = 0.0
         self.consumer_num = itertools.count(1)
 
         try:
@@ -422,13 +420,13 @@ class Connection(object):
                 self.consume()
             except greenlet.GreenletExit:
                 return
-        if not self.consumer_thread:
+        if self.consumer_thread is None:
             self.consumer_thread = eventlet.spawn(_consumer_thread)
         return self.consumer_thread
 
     def cancel_consumer_thread(self):
         """Cancel a consumer thread"""
-        if self.consumer_thread:
+        if self.consumer_thread is not None:
             self.consumer_thread.kill()
             try:
                 self.consumer_thread.wait()