Merge branch 'develop' into release/0.6.x

docs/conf.py

@@ -53,7 +53,7 @@
 # The short X.Y version.
 version = '0.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.6'
+release = '0.6.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/release-notes.rst

@@ -11,6 +11,12 @@ this will almost certainly not break the majority of things built on vumi, old
 code or code that relies too heavily on the details of worker setup may need to
 be fixed.
 
+:Version: 0.6.7
+:Date released: 19 April 2016
+
+* Re-fix the bug in the Vumi Bridge transport that prevents it making outbound
+  requests.
+
 :Version: 0.6.6
 :Date released: 18 April 2016
 

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name="vumi",
-    version="0.6.6",
+    version="0.6.7",
     url='http://github.com/praekelt/vumi',
     license='BSD',
     description="Super-scalable messaging engine for the delivery of SMS, "

vumi/__init__.py

@@ -2,4 +2,4 @@
 Vumi scalable text messaging engine.
 """
 
-__version__ = "0.6.6"
+__version__ = "0.6.7"

vumi/transports/vumi_bridge/tests/test_vumi_bridge.py

@@ -241,4 +241,5 @@ def test_teardown_before_start(self):
         yield transport.teardown_transport()
 
     def test_agent_factory_default(self):
-        self.assertEqual(GoConversationTransport.agent_factory, Agent)
+        self.assertTrue(isinstance(
+            GoConversationTransport.agent_factory(), Agent))

vumi/transports/vumi_bridge/vumi_bridge.py

@@ -6,6 +6,7 @@
 
 import certifi
 
+from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks
 from twisted.web import http
 from twisted.web.resource import Resource
@@ -73,7 +74,10 @@ class VumiBridgeTransportConfig(Transport.CONFIG_CLASS):
 
 class GoConversationTransportBase(Transport):
 
-    agent_factory = Agent  # For swapping out the Agent we use in tests.
+    @classmethod
+    def agent_factory(cls):
+        """For swapping out the Agent we use in tests."""
+        return Agent(reactor)
 
     def get_url(self, path):
         config = self.get_static_config()