[telepathy-gabble/master] break a race when opening the bytestream

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Fri Apr 3 09:26:10 PDT 2009


---
 .../twisted/file-transfer/file_transfer_helper.py  |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/file-transfer/file_transfer_helper.py b/tests/twisted/file-transfer/file_transfer_helper.py
index f356a2f..1ca560b 100644
--- a/tests/twisted/file-transfer/file_transfer_helper.py
+++ b/tests/twisted/file-transfer/file_transfer_helper.py
@@ -231,11 +231,11 @@ class ReceiveFileTest(FileTransferTest):
         # Got SI reply
         self.bytestream.check_si_reply(iq_event.stanza)
 
-        self.bytestream.open_bytestream()
-
-        offset_event, state_event = self.q.expect_many(
+        _, events = self.bytestream.open_bytestream([], [
             EventPattern('dbus-signal', signal='InitialOffsetDefined'),
-            EventPattern('dbus-signal', signal='FileTransferStateChanged'))
+            EventPattern('dbus-signal', signal='FileTransferStateChanged')])
+
+        offset_event, state_event = events
 
         offset = offset_event.args[0]
         # We don't support resume
-- 
1.5.6.5




More information about the telepathy-commits mailing list