diff options
| author | Joe Hildebrand <joe-github@cursive.net> | 2012-10-31 14:44:51 -0600 |
|---|---|---|
| committer | Joe Hildebrand <joe-github@cursive.net> | 2012-10-31 14:44:51 -0600 |
| commit | ef1c4368d0b18c55609a75f6494037e2baecc0b3 (patch) | |
| tree | 626c0287a09b81ed5415de95f9adeb24ad42293a | |
| parent | 48def71d0c35755d0d34f3be4ebc35a26c12693b (diff) | |
| parent | 2229ad8d8e51b73a7900b118dfab5d7b449f17ce (diff) | |
| download | slixmpp-ef1c4368d0b18c55609a75f6494037e2baecc0b3.tar.gz slixmpp-ef1c4368d0b18c55609a75f6494037e2baecc0b3.tar.bz2 slixmpp-ef1c4368d0b18c55609a75f6494037e2baecc0b3.tar.xz slixmpp-ef1c4368d0b18c55609a75f6494037e2baecc0b3.zip | |
Merge branch 'master' of git://github.com/fritzy/SleekXMPP into develop
# By Joe Hildebrand (2) and Lance Stout (1)
# Via Lance Stout
* 'master' of git://github.com/fritzy/SleekXMPP:
Relax timing issues in Iq timeout callback test.
update JID_CACHE logic again.
Allow IQ timeouts to be asynchronous, by passing a timeout_callback parameter to send(). An example modification of disco is included. If this approach is approved, I'll go through and update the other plugins.
Conflicts:
tests/test_stream_handlers.py
| -rw-r--r-- | tests/test_stream_handlers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_stream_handlers.py b/tests/test_stream_handlers.py index cdd128bb..d3850a94 100644 --- a/tests/test_stream_handlers.py +++ b/tests/test_stream_handlers.py @@ -177,7 +177,7 @@ class TestHandlers(SleekTest): """) # Give event queue time to process - time.sleep(0.1) + time.sleep(1) self.failUnless(events == ['timeout'], "Iq timeout was not executed: %s" % events) |