Remove tornado-related code from almost everything.

Left it in api where it is still being used pending gundlach's changes.

7 files changed, 18 insertions, 29 deletions

diff --git a/nova/rpc.py b/nova/rpc.py
index 84a9b5590..d83dd7a7c 100644
--- a/nova/rpc.py
+++ b/nova/rpc.py
@@ -81,21 +81,6 @@ class Consumer(messaging.Consumer):
         self.failed_connection = False
         super(Consumer, self).__init__(*args, **kwargs)
 
-    # TODO(termie): it would be nice to give these some way of automatically
-    #               cleaning up after themselves
-    def attach_to_tornado(self, io_inst=None):
-        """Attach a callback to tornado that fires 10 times a second"""
-        from tornado import ioloop
-        if io_inst is None:
-            io_inst = ioloop.IOLoop.instance()
-
-        injected = ioloop.PeriodicCallback(
-            lambda: self.fetch(enable_callbacks=True), 100, io_loop=io_inst)
-        injected.start()
-        return injected
-
-    attachToTornado = attach_to_tornado
-
     def fetch(self, no_ack=None, auto_ack=None, enable_callbacks=False):
         """Wraps the parent fetch with some logic for failed connections"""
         # TODO(vish): the logic for failed connections and logging should be
@@ -123,6 +108,7 @@ class Consumer(messaging.Consumer):
         """Attach a callback to twisted that fires 10 times a second"""
         loop = task.LoopingCall(self.fetch, enable_callbacks=True)
         loop.start(interval=0.1)
+        return loop
 
 
 class Publisher(messaging.Publisher):
diff --git a/nova/test.py b/nova/test.py
index c392c8a84..5380d5743 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -62,6 +62,7 @@ class TrialTestCase(unittest.TestCase):
         self.mox = mox.Mox()
         self.stubs = stubout.StubOutForTesting()
         self.flag_overrides = {}
+        self.injected = []
 
     def tearDown(self): # pylint: disable-msg=C0103
         """Runs after each test method to finalize/tear down test environment"""
@@ -72,6 +73,9 @@ class TrialTestCase(unittest.TestCase):
         self.stubs.SmartUnsetAll()
         self.mox.VerifyAll()
 
+        for x in self.injected:
+            x.stop()
+
         if FLAGS.fake_rabbit:
             fakerabbit.reset_all()
 
@@ -99,7 +103,6 @@ class BaseTestCase(TrialTestCase):
         super(BaseTestCase, self).setUp()
         # TODO(termie): we could possibly keep a more global registry of
         #               the injected listeners... this is fine for now though
-        self.injected = []
         self.ioloop = ioloop.IOLoop.instance()
 
         self._waiting = None
@@ -109,8 +112,6 @@ class BaseTestCase(TrialTestCase):
     def tearDown(self):# pylint: disable-msg=C0103
         """Runs after each test method to finalize/tear down test environment"""
         super(BaseTestCase, self).tearDown()
-        for x in self.injected:
-            x.stop()
         if FLAGS.fake_rabbit:
             fakerabbit.reset_all()
 
diff --git a/nova/tests/access_unittest.py b/nova/tests/access_unittest.py
index fa0a090a0..4cdf42091 100644
--- a/nova/tests/access_unittest.py
+++ b/nova/tests/access_unittest.py
@@ -30,7 +30,7 @@ FLAGS = flags.FLAGS
 class Context(object):
     pass
 
-class AccessTestCase(test.BaseTestCase):
+class AccessTestCase(test.TrialTestCase):
     def setUp(self):
         super(AccessTestCase, self).setUp()
         FLAGS.connection_type = 'fake'
diff --git a/nova/tests/auth_unittest.py b/nova/tests/auth_unittest.py
index 0b404bfdc..b219d0e3c 100644
--- a/nova/tests/auth_unittest.py
+++ b/nova/tests/auth_unittest.py
@@ -31,7 +31,7 @@ from nova.endpoint import cloud
 FLAGS = flags.FLAGS
 
 
-class AuthTestCase(test.BaseTestCase):
+class AuthTestCase(test.TrialTestCase):
     flush_db = False
     def setUp(self):
         super(AuthTestCase, self).setUp()
diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py
index 900ff5a97..0add53937 100644
--- a/nova/tests/cloud_unittest.py
+++ b/nova/tests/cloud_unittest.py
@@ -19,7 +19,6 @@
 import logging
 import StringIO
 import time
-from tornado import ioloop
 from twisted.internet import defer
 import unittest
 from xml.etree import ElementTree
@@ -36,7 +35,7 @@ from nova.endpoint import cloud
 FLAGS = flags.FLAGS
 
 
-class CloudTestCase(test.BaseTestCase):
+class CloudTestCase(test.TrialTestCase):
     def setUp(self):
         super(CloudTestCase, self).setUp()
         self.flags(connection_type='fake',
@@ -51,18 +50,21 @@ class CloudTestCase(test.BaseTestCase):
         # set up a service
         self.compute = service.ComputeService()
         self.compute_consumer = rpc.AdapterConsumer(connection=self.conn,
-                                                     topic=FLAGS.compute_topic,
-                                                     proxy=self.compute)
-        self.injected.append(self.compute_consumer.attach_to_tornado(self.ioloop))
+                                                    topic=FLAGS.compute_topic,
+                                                    proxy=self.compute)
+        self.injected.append(self.compute_consumer.attach_to_twisted())
 
         try:
             manager.AuthManager().create_user('admin', 'admin', 'admin')
         except: pass
         admin = manager.AuthManager().get_user('admin')
         project = manager.AuthManager().create_project('proj', 'admin', 'proj')
-        self.context = api.APIRequestContext(handler=None,project=project,user=admin)
+        self.context = api.APIRequestContext(handler=None,
+                                             project=project,
+                                             user=admin)
 
     def tearDown(self):
+        super(CloudTestCase, self).tearDown()
         manager.AuthManager().delete_project('proj')
         manager.AuthManager().delete_user('admin')
 
diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py
index dece4b5d5..b5970d405 100644
--- a/nova/tests/objectstore_unittest.py
+++ b/nova/tests/objectstore_unittest.py
@@ -53,7 +53,7 @@ os.makedirs(os.path.join(OSS_TEMPDIR, 'images'))
 os.makedirs(os.path.join(OSS_TEMPDIR, 'buckets'))
 
 
-class ObjectStoreTestCase(test.BaseTestCase):
+class ObjectStoreTestCase(test.TrialTestCase):
     """Test objectstore API directly."""
 
     def setUp(self): # pylint: disable-msg=C0103
diff --git a/nova/tests/rpc_unittest.py b/nova/tests/rpc_unittest.py
index e12a28fbc..e11967987 100644
--- a/nova/tests/rpc_unittest.py
+++ b/nova/tests/rpc_unittest.py
@@ -30,7 +30,7 @@ from nova import test
 FLAGS = flags.FLAGS
 
 
-class RpcTestCase(test.BaseTestCase):
+class RpcTestCase(test.TrialTestCase):
     """Test cases for rpc"""
     def setUp(self):  # pylint: disable-msg=C0103
         super(RpcTestCase, self).setUp()
@@ -40,7 +40,7 @@ class RpcTestCase(test.BaseTestCase):
                                             topic='test',
                                             proxy=self.receiver)
 
-        self.injected.append(self.consumer.attach_to_tornado(self.ioloop))
+        self.injected.append(self.consumer.attach_to_twisted())
 
     def test_call_succeed(self):
         """Get a value through rpc call"""