summaryrefslogtreecommitdiff
path: root/tests/test_stream_handlers.py
diff options
context:
space:
mode:
authorNathan Fritz <fritzy@netflint.net>2011-08-12 16:35:15 -0700
committerNathan Fritz <fritzy@netflint.net>2011-08-12 16:35:15 -0700
commitbd8c110f00a41917839a0578de68b80c39ee6e16 (patch)
treecc44410ba6e6efe7cfcf1decc8f1b1d8b2692aa7 /tests/test_stream_handlers.py
parent0050c5112428939346397a4d2edfeb313c0fd497 (diff)
parentd7fe724145c2e01d1028dab773fb49414c6856dd (diff)
downloadslixmpp-bd8c110f00a41917839a0578de68b80c39ee6e16.tar.gz
slixmpp-bd8c110f00a41917839a0578de68b80c39ee6e16.tar.bz2
slixmpp-bd8c110f00a41917839a0578de68b80c39ee6e16.tar.xz
slixmpp-bd8c110f00a41917839a0578de68b80c39ee6e16.zip
Merge branch 'exceptions' into develop
Diffstat (limited to 'tests/test_stream_handlers.py')
-rw-r--r--tests/test_stream_handlers.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/test_stream_handlers.py b/tests/test_stream_handlers.py
index dae4456d..1b831e21 100644
--- a/tests/test_stream_handlers.py
+++ b/tests/test_stream_handlers.py
@@ -90,7 +90,10 @@ class TestHandlers(SleekTest):
iq['id'] = 'test2'
iq['type'] = 'set'
iq['query'] = 'test2'
- reply = iq.send(block=True, timeout=0)
+ try:
+ reply = iq.send(block=True, timeout=0)
+ except IqTimeout:
+ pass
self.xmpp.add_event_handler('message', waiter_handler, threaded=True)