summaryrefslogtreecommitdiff
path: root/tests/test_stream.py
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2015-02-12 12:23:47 +0100
committermathieui <mathieui@mathieui.net>2015-02-12 12:23:47 +0100
commit1e2665df19a866d5676abec566b9d8f190ecdc80 (patch)
tree9fe2f0c501d376291f3d9efc3e9550b34afbf6c7 /tests/test_stream.py
parent4d063e287e1bb2010d115325a3c8c6ca7c542bfc (diff)
downloadslixmpp-1e2665df19a866d5676abec566b9d8f190ecdc80.tar.gz
slixmpp-1e2665df19a866d5676abec566b9d8f190ecdc80.tar.bz2
slixmpp-1e2665df19a866d5676abec566b9d8f190ecdc80.tar.xz
slixmpp-1e2665df19a866d5676abec566b9d8f190ecdc80.zip
Update the test suite.
- monkey-patch our own monkey-patched idle_call to run events immediatly rather than adding them to the event queue, and add a fake transport with a fake socket. - remove the test file related to xep_0059 as it relies on blocking behavior, and comment out one xep_0030 test uses xep_0059 - remove many instances of threading and sleep()s because they do nothing except waste time and introduce race conditions. - keep exactly two sleep() in IoT xeps because they rely on timeouts
Diffstat (limited to 'tests/test_stream.py')
-rw-r--r--tests/test_stream.py21
1 files changed, 1 insertions, 20 deletions
diff --git a/tests/test_stream.py b/tests/test_stream.py
index 85f22c56..0476039c 100644
--- a/tests/test_stream.py
+++ b/tests/test_stream.py
@@ -16,7 +16,7 @@ class TestStreamTester(SlixTest):
self.stream_start(mode='client')
def echo(msg):
- msg.reply('Thanks for sending: %(body)s' % msg).send()
+ msg.reply('Thanks for sending: %s' % msg['body']).send()
self.xmpp.add_event_handler('message', echo)
@@ -58,23 +58,4 @@ class TestStreamTester(SlixTest):
self.stream_start(mode='client', skip=False)
self.send_header(sto='localhost')
- def testStreamDisconnect(self):
- """Test that the test socket can simulate disconnections."""
- self.stream_start()
- events = set()
-
- def stream_error(event):
- events.add('socket_error')
-
- self.xmpp.add_event_handler('socket_error', stream_error)
-
- self.stream_disconnect()
- self.xmpp.send_raw(' ')
-
- time.sleep(.1)
-
- self.failUnless('socket_error' in events,
- "Stream error event not raised: %s" % events)
-
-
suite = unittest.TestLoader().loadTestsFromTestCase(TestStreamTester)