diff options
| author | Nathan Fritz <nathan@andyet.net> | 2011-08-10 13:37:49 -0700 |
|---|---|---|
| committer | Nathan Fritz <nathan@andyet.net> | 2011-08-10 13:37:49 -0700 |
| commit | a189cb8333d5f59caa9015f0ded222696987d957 (patch) | |
| tree | 467f202bc7f85a4cde85a5add3c372515f18adc3 /tests/test_stream_xep_0030.py | |
| parent | 0d4825d3ea0562f305939e653e3d414e70e4aaa8 (diff) | |
| parent | 156b3200e3b5ad1b2e64eecc48cdc792f7b2ffd9 (diff) | |
| download | slixmpp-a189cb8333d5f59caa9015f0ded222696987d957.tar.gz slixmpp-a189cb8333d5f59caa9015f0ded222696987d957.tar.bz2 slixmpp-a189cb8333d5f59caa9015f0ded222696987d957.tar.xz slixmpp-a189cb8333d5f59caa9015f0ded222696987d957.zip | |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'tests/test_stream_xep_0030.py')
| -rw-r--r-- | tests/test_stream_xep_0030.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/test_stream_xep_0030.py b/tests/test_stream_xep_0030.py index c960fc7a..1666d3a1 100644 --- a/tests/test_stream_xep_0030.py +++ b/tests/test_stream_xep_0030.py @@ -12,7 +12,6 @@ class TestStreamDisco(SleekTest): """ def tearDown(self): - sys.excepthook = sys.__excepthook__ self.stream_close() def testInfoEmptyDefaultNode(self): @@ -531,11 +530,6 @@ class TestStreamDisco(SleekTest): raised_exceptions = [] - def catch_exception(*args, **kwargs): - raised_exceptions.append(True) - - sys.excepthook = catch_exception - self.stream_start(mode='client', plugins=['xep_0030', 'xep_0059']) @@ -544,8 +538,14 @@ class TestStreamDisco(SleekTest): iterator=True) results.amount = 10 + def run_test(): + try: + results.next() + except StopIteration: + raised_exceptions.append(True) + t = threading.Thread(name="get_items_iterator", - target=results.next) + target=run_test) t.start() self.send(""" |