From 1e2665df19a866d5676abec566b9d8f190ecdc80 Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Thu, 12 Feb 2015 12:23:47 +0100
Subject: 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
---
 tests/test_stream_xep_0047.py | 36 +++++++-----------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

(limited to 'tests/test_stream_xep_0047.py')

diff --git a/tests/test_stream_xep_0047.py b/tests/test_stream_xep_0047.py
index fd64e898..2cc43823 100644
--- a/tests/test_stream_xep_0047.py
+++ b/tests/test_stream_xep_0047.py
@@ -24,11 +24,8 @@ class TestInBandByteStreams(SlixTest):
 
         self.xmpp.add_event_handler('ibb_stream_start', on_stream_start)
 
-        t = threading.Thread(name='open_stream',
-                             target=self.xmpp['xep_0047'].open_stream,
-                             args=('tester@localhost/receiver',),
-                             kwargs={'sid': 'testing'})
-        t.start()
+        self.xmpp['xep_0047'].open_stream('tester@localhost/receiver',
+                                          sid='testing')
 
         self.send("""
           <iq type="set" to="tester@localhost/receiver" id="1">
@@ -45,10 +42,6 @@ class TestInBandByteStreams(SlixTest):
               from="tester@localhost/receiver" />
         """)
 
-        t.join()
-
-        time.sleep(0.2)
-
         self.assertEqual(events, ['ibb_stream_start'])
 
     def testAysncOpenStream(self):
@@ -64,13 +57,9 @@ class TestInBandByteStreams(SlixTest):
 
         self.xmpp.add_event_handler('ibb_stream_start', on_stream_start)
 
-        t = threading.Thread(name='open_stream',
-                             target=self.xmpp['xep_0047'].open_stream,
-                             args=('tester@localhost/receiver',),
-                             kwargs={'sid': 'testing',
-                                     'block': False,
-                                     'callback': stream_callback})
-        t.start()
+        self.xmpp['xep_0047'].open_stream('tester@localhost/receiver',
+                                          sid='testing',
+                                          callback=stream_callback)
 
         self.send("""
           <iq type="set" to="tester@localhost/receiver" id="1">
@@ -87,10 +76,6 @@ class TestInBandByteStreams(SlixTest):
               from="tester@localhost/receiver" />
         """)
 
-        t.join()
-
-        time.sleep(0.2)
-
         self.assertEqual(events, set(['ibb_stream_start', 'callback']))
 
     def testSendData(self):
@@ -108,11 +93,8 @@ class TestInBandByteStreams(SlixTest):
         self.xmpp.add_event_handler('ibb_stream_start', on_stream_start)
         self.xmpp.add_event_handler('ibb_stream_data', on_stream_data)
 
-        t = threading.Thread(name='open_stream',
-                             target=self.xmpp['xep_0047'].open_stream,
-                             args=('tester@localhost/receiver',),
-                             kwargs={'sid': 'testing'})
-        t.start()
+        self.xmpp['xep_0047'].open_stream('tester@localhost/receiver',
+                                          sid='testing')
 
         self.send("""
           <iq type="set" to="tester@localhost/receiver" id="1">
@@ -129,10 +111,6 @@ class TestInBandByteStreams(SlixTest):
               from="tester@localhost/receiver" />
         """)
 
-        t.join()
-
-        time.sleep(0.2)
-
         stream = streams[0]
 
 
-- 
cgit v1.2.3