pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git://github.com/fritzy/SleekXMPP into develop

Browse source 
# 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
This commit is contained in:
Joe Hildebrand 2012-10-31 14:44:51 -06:00
commit ef1c4368d0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/test_stream_handlers.py
View file

@ -177,7 +177,7 @@ class TestHandlers(SleekTest):
""") """)
# Give event queue time to process # Give event queue time to process
time.sleep(0.1) time.sleep(1)
self.failUnless(events == ['timeout'], self.failUnless(events == ['timeout'],
"Iq timeout was not executed: %s" % events) "Iq timeout was not executed: %s" % events)