diff options
| author | mathieui <mathieui@mathieui.net> | 2015-02-12 12:23:47 +0100 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2015-02-12 12:23:47 +0100 |
| commit | 1e2665df19a866d5676abec566b9d8f190ecdc80 (patch) | |
| tree | 9fe2f0c501d376291f3d9efc3e9550b34afbf6c7 /tests/test_stream_xep_0066.py | |
| parent | 4d063e287e1bb2010d115325a3c8c6ca7c542bfc (diff) | |
| download | slixmpp-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_xep_0066.py')
| -rw-r--r-- | tests/test_stream_xep_0066.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/test_stream_xep_0066.py b/tests/test_stream_xep_0066.py index a9f2bc65..159333c7 100644 --- a/tests/test_stream_xep_0066.py +++ b/tests/test_stream_xep_0066.py @@ -15,13 +15,8 @@ class TestOOB(SlixTest): url = 'http://github.com/fritzy/Slixmpp/blob/master/README' - t = threading.Thread( - name='send_oob', - target=self.xmpp['xep_0066'].send_oob, - args=('user@example.com', url), - kwargs={'desc': 'Slixmpp README'}) - - t.start() + self.xmpp['xep_0066'].send_oob('user@example.com', url, + desc='Slixmpp README') self.send(""" <iq to="user@example.com" type="set" id="1"> @@ -38,7 +33,5 @@ class TestOOB(SlixTest): from="user@example.com" /> """) - t.join() - suite = unittest.TestLoader().loadTestsFromTestCase(TestOOB) |