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

1 files changed, 5 insertions, 9 deletions

diff --git a/tests/test_stream_xep_0092.py b/tests/test_stream_xep_0092.py
index ca1c3dfa..1f1eac00 100644
--- a/tests/test_stream_xep_0092.py
+++ b/tests/test_stream_xep_0092.py
@@ -35,16 +35,14 @@ class TestStreamSet(SlixTest):
     def testMakeSoftwareVersionRequest(self):
         results = []
 
-        def query():
-            r = self.xmpp['xep_0092'].get_version('foo@bar')
-            results.append((r['software_version']['name'],
-                            r['software_version']['version'],
-                            r['software_version']['os']))
+        def callback(result):
+            results.append((result['software_version']['name'],
+                            result['software_version']['version'],
+                            result['software_version']['os']))
 
         self.stream_start(mode='client', plugins=['xep_0030', 'xep_0092'])
 
-        t = threading.Thread(target=query)
-        t.start()
+        self.xmpp['xep_0092'].get_version('foo@bar', callback=callback)
 
         self.send("""
           <iq type="get" id="1" to="foo@bar">
@@ -62,8 +60,6 @@ class TestStreamSet(SlixTest):
           </iq>
         """)
 
-        t.join()
-
         expected = [('Foo', '1.0', 'Linux')]
         self.assertEqual(results, expected,
                 "Did not receive expected results: %s" % results)