Merge branch 'feature/issue-622-fix-smpp-tests-under-real-redis' into…

… develop
praekeltfoundation · Oct 11, 2013 · 5faa676 · 5faa676
2 parents 4c4ba9f + 42c4bbb
commit 5faa676
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/vumi/transports/smpp/service.py b/vumi/transports/smpp/service.py
@@ -1,7 +1,6 @@
 
 from twisted.python import log
-from twisted.internet import reactor, defer
-from twisted.internet.endpoints import serverFromString
+from twisted.internet import defer
 
 from vumi.worker import BaseWorker
 from vumi.transports.smpp.clientserver.server import SmscServerFactory

diff --git a/vumi/transports/smpp/tests/test_smpp.py b/vumi/transports/smpp/tests/test_smpp.py
@@ -535,6 +535,9 @@ def test_submit_sm_encoding(self):
             sms['short_message'],
             u'Zoë destroyer of Ascii!'.encode('latin-1'))
 
+        # clear ack and nack
+        yield self.wait_for_dispatched_events(2)
+
     @inlineCallbacks
     def test_submit_sm_data_coding(self):
         # Startup
@@ -561,6 +564,9 @@ def test_submit_sm_data_coding(self):
         sms = submit_sm_pdu['pdu']['body']['mandatory_parameters']
         self.assertEqual(sms['data_coding'], 8)
 
+        # clear ack and nack
+        yield self.wait_for_dispatched_events(2)
+
     @inlineCallbacks
     def test_submit_and_deliver_ussd_continue(self):
         # Startup