summaryrefslogtreecommitdiff
path: root/tests/test_stream_xep_0030.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-07-01 15:19:37 -0700
committerLance Stout <lancestout@gmail.com>2011-07-01 15:19:37 -0700
commit04def6d9256b0d5ef97d75b08ae9330d3c253948 (patch)
tree04d04ff175387c2bc31f26be0e360e33b9012a81 /tests/test_stream_xep_0030.py
parent634f5d691bab9855deddc4c201389bb60470d76e (diff)
parent2a2ac73845ffc8695e2bc55746f45e1a18d55e6c (diff)
downloadslixmpp-04def6d9256b0d5ef97d75b08ae9330d3c253948.tar.gz
slixmpp-04def6d9256b0d5ef97d75b08ae9330d3c253948.tar.bz2
slixmpp-04def6d9256b0d5ef97d75b08ae9330d3c253948.tar.xz
slixmpp-04def6d9256b0d5ef97d75b08ae9330d3c253948.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'tests/test_stream_xep_0030.py')
-rw-r--r--tests/test_stream_xep_0030.py14
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("""