[telepathy-gabble/master] file_transfer_helper: break race when calling bytestream.wait_bytestream_closed()
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Fri Apr 3 07:29:00 PDT 2009
---
.../twisted/file-transfer/file_transfer_helper.py | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/tests/twisted/file-transfer/file_transfer_helper.py b/tests/twisted/file-transfer/file_transfer_helper.py
index 432f3da..b182673 100644
--- a/tests/twisted/file-transfer/file_transfer_helper.py
+++ b/tests/twisted/file-transfer/file_transfer_helper.py
@@ -406,11 +406,10 @@ class SendFileTest(FileTransferTest):
assert self.count == self.file.size
# FileTransferStateChanged could have already been fired
- e = self.q.expect('dbus-signal', signal='FileTransferStateChanged')
-
- self.bytestream.wait_bytestream_closed()
+ events = self.bytestream.wait_bytestream_closed(
+ [EventPattern('dbus-signal', signal='FileTransferStateChanged')])
- state, reason = e.args
+ state, reason = events[0].args
assert state == cs.FT_STATE_COMPLETED
assert reason == cs.FT_STATE_CHANGE_REASON_NONE
--
1.5.6.5
More information about the telepathy-commits
mailing list