Merge branch 'feature/issue-1033-always-wrap-abort-connection' into d…

…evelop

vumi/tests/fake_connection.py

@@ -217,13 +217,21 @@ def patch_transport_fake_push_producer(transport):
 
 def patch_transport_abortConnection(transport, protocol):
     """
-    Patch abortConnection() onto the transport if it doesn't already have it.
-    (`Agent` assumes its transport has this.)
+    Patch abortConnection() on the transport or add it if it doesn't already
+    exist (`Agent` assumes its transport has this).
+
+    The patched method sets an internal flag recording the abort and then calls
+    the original method (if it existed) or transport.loseConnection (if it
+    didn't).
     """
+    _old_abortConnection = getattr(
+        transport, 'abortConnection', transport.loseConnection)
+
     def abortConnection():
         protocol._fake_connection_aborted = True
-        transport.loseConnection()
-    patch_if_missing(transport, 'abortConnection', abortConnection)
+        _old_abortConnection()
+
+    transport.abortConnection = abortConnection
 
 
 class FakeServerProtocolWrapper(Protocol):