Remove obsolete get_stubbed_channel() test helper.

vumi/blinkenlights/heartbeat/tests/test_publisher.py

@@ -6,11 +6,10 @@
 
 from twisted.internet.defer import inlineCallbacks
 
-from vumi.tests.utils import get_stubbed_channel
 from vumi.tests.fake_amqp import FakeAMQPBroker
 from vumi.blinkenlights.heartbeat import publisher
 from vumi.errors import MissingMessageField
-from vumi.tests.helpers import VumiTestCase
+from vumi.tests.helpers import VumiTestCase, WorkerHelper
 
 
 class MockHeartBeatPublisher(publisher.HeartBeatPublisher):
@@ -36,13 +35,14 @@ def gen_fake_attrs(self):
 
     @inlineCallbacks
     def test_publish_heartbeat(self):
-        self.broker = FakeAMQPBroker()
-        channel = yield get_stubbed_channel(self.broker)
+        broker = FakeAMQPBroker()
+        client = WorkerHelper.get_fake_amqp_client(broker)
+        channel = yield client.get_channel()
         pub = MockHeartBeatPublisher(self.gen_fake_attrs)
         pub.start(channel)
         pub._beat()
 
-        [msg] = self.broker.get_dispatched("vumi.health", "heartbeat.inbound")
+        [msg] = broker.get_dispatched("vumi.health", "heartbeat.inbound")
         self.assertEqual(json.loads(msg.body), self.gen_fake_attrs())
 
     def test_message_validation(self):

vumi/blinkenlights/metrics.py

@@ -75,7 +75,8 @@ def stop_polling(self):
         Stop the metric polling and publishing task.
         """
         if self._task:
-            self._task.stop()
+            if self._task.running:
+                self._task.stop()
             self._task = None
 
     def publish_metrics(self):

vumi/blinkenlights/tests/test_metrics.py

@@ -4,7 +4,6 @@
 from twisted.internet.defer import inlineCallbacks, Deferred
 
 from vumi.blinkenlights import metrics
-from vumi.tests.utils import get_stubbed_channel
 from vumi.message import Message
 from vumi.service import Worker
 from vumi.tests.helpers import VumiTestCase, WorkerHelper
@@ -17,7 +16,8 @@ def setUp(self):
 
     @inlineCallbacks
     def start_publisher(self, publisher):
-        channel = yield get_stubbed_channel(self.worker_helper.broker)
+        client = WorkerHelper.get_fake_amqp_client(self.worker_helper.broker)
+        channel = yield client.get_channel()
         publisher.start(channel)
 
     def _sleep(self, delay):
@@ -76,7 +76,8 @@ def wait_publish(self):
 
     @inlineCallbacks
     def start_manager_as_publisher(self, manager):
-        channel = yield get_stubbed_channel(self.worker_helper.broker)
+        client = WorkerHelper.get_fake_amqp_client(self.worker_helper.broker)
+        channel = yield client.get_channel()
         manager.start(channel)
         self.add_cleanup(manager.stop)
 
@@ -108,9 +109,7 @@ def test_start_manager_no_publisher(self):
         mm = metrics.MetricManager("vumi.test.")
         self.assertEqual(mm._publisher, None)
         self.assertEqual(mm._task, None)
-        channel = yield get_stubbed_channel(self.worker_helper.broker)
-        mm.start(channel)
-        self.add_cleanup(mm.stop)
+        yield self.start_manager_as_publisher(mm)
         self.assertIsInstance(mm._publisher, metrics.MetricPublisher)
         self.assertNotEqual(mm._task, None)
 
@@ -120,8 +119,8 @@ def test_start_manager_publisher_and_channel(self):
         mm = metrics.MetricManager("vumi.test.", publisher=publisher)
         self.assertEqual(mm._publisher, publisher)
         self.assertEqual(mm._task, None)
-        channel = yield get_stubbed_channel(self.worker_helper.broker)
-        self.assertRaises(RuntimeError, mm.start, channel)
+        yield self.assertFailure(
+            self.start_manager_as_publisher(mm), RuntimeError)
 
     def test_start_polling_no_publisher(self):
         mm = metrics.MetricManager("vumi.test.")
@@ -251,7 +250,6 @@ def test_in_worker(self):
 
     @inlineCallbacks
     def test_task_failure(self):
-        channel = yield get_stubbed_channel()
         mm = metrics.MetricManager("vumi.test.", 0.1)
         wait_error = Deferred()
 
@@ -264,7 +262,7 @@ def poll(self):
                 raise BadMetricError("bad metric")
 
         mm.register(BadMetric("bad"))
-        mm.start(channel)
+        yield self.start_manager_as_publisher(mm)
         yield wait_error
         yield self._sleep(0)  # allow log message to be processed
         error, = self.flushLoggedErrors(BadMetricError)

vumi/blinkenlights/tests/test_metrics_workers.py

@@ -2,7 +2,6 @@
 from twisted.internet.protocol import DatagramProtocol
 from twisted.internet import reactor
 
-from vumi.tests.utils import get_stubbed_channel
 from vumi.blinkenlights import metrics_workers
 from vumi.blinkenlights.message20110818 import MetricMessage
 from vumi.tests.helpers import VumiTestCase, WorkerHelper
@@ -269,7 +268,8 @@ def _check_msg(self, channel, metric, value, timestamp):
     @inlineCallbacks
     def test_publish_metric(self):
         datapoint = ("vumi.test.v1", 1.0, 1234)
-        channel = yield get_stubbed_channel(self.worker_helper.broker)
+        client = WorkerHelper.get_fake_amqp_client(self.worker_helper.broker)
+        channel = yield client.get_channel()
         pub = metrics_workers.GraphitePublisher()
         pub.start(channel)
         pub.publish_metric(*datapoint)

vumi/tests/utils.py

@@ -65,12 +65,6 @@ def _connect(self, worker, timeout, bindAddress):
         reactor.callLater(0, worker._amqp_connected, amq_client)
 
 
-def get_stubbed_channel(broker=None, id=0):
-    spec = get_spec(vumi_resource_path("amqp-spec-0-8.xml"))
-    amq_client = FakeAMQClient(spec, {}, broker)
-    return amq_client.channel(id)
-
-
 def FakeRedis():
     warnings.warn("Use of FakeRedis is deprecated. "
                   "Use persist.tests.fake_redis instead.",
@@ -517,7 +511,7 @@ def mkmsg_ack(self, user_message_id='1', sent_message_id='abc',
             )
 
     def mkmsg_nack(self, user_message_id='1', transport_metadata=None,
-                    transport_name=None, nack_reason='unknown'):
+                   transport_name=None, nack_reason='unknown'):
         if transport_metadata is None:
             transport_metadata = {}
         if transport_name is None: