summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-12-21 11:33:40 -0500
committerLance Stout <lancestout@gmail.com>2010-12-21 11:33:40 -0500
commit3657bf66363844bf7351ea84279eeb74b0449d5f (patch)
treee3a89300ae19a3b9f78596f42a05a5926e3ddc1f /tests
parentadade2e5eccf5a0c48b0b6541fc3d990d732710c (diff)
parentf97f6e5985b5781ce87a2095b4bf9cccb12ae978 (diff)
downloadslixmpp-3657bf66363844bf7351ea84279eeb74b0449d5f.tar.gz
slixmpp-3657bf66363844bf7351ea84279eeb74b0449d5f.tar.bz2
slixmpp-3657bf66363844bf7351ea84279eeb74b0449d5f.tar.xz
slixmpp-3657bf66363844bf7351ea84279eeb74b0449d5f.zip
Merge branch 'develop' into roster
Diffstat (limited to 'tests')
-rw-r--r--tests/test_stream_exceptions.py37
1 files changed, 22 insertions, 15 deletions
diff --git a/tests/test_stream_exceptions.py b/tests/test_stream_exceptions.py
index b7be6485..e1b70d39 100644
--- a/tests/test_stream_exceptions.py
+++ b/tests/test_stream_exceptions.py
@@ -10,6 +10,7 @@ class TestStreamExceptions(SleekTest):
"""
def tearDown(self):
+ sys.excepthook = sys.__excepthook__
self.stream_close()
def testXMPPErrorException(self):
@@ -78,9 +79,16 @@ class TestStreamExceptions(SleekTest):
def testUnknownException(self):
"""Test raising an generic exception in a threaded handler."""
+ raised_errors = []
+
def message(msg):
raise ValueError("Did something wrong")
+ def catch_error(*args, **kwargs):
+ raised_errors.append(True)
+
+ sys.excepthook = catch_error
+
self.stream_start()
self.xmpp.add_event_handler('message', message)
@@ -90,21 +98,20 @@ class TestStreamExceptions(SleekTest):
</message>
""")
- if sys.version_info < (3, 0):
- self.send("""
- <message type="error">
- <error type="cancel">
- <undefined-condition
- xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
- <text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">
- SleekXMPP got into trouble.
- </text>
- </error>
- </message>
- """)
- else:
- # Unfortunately, tracebacks do not make for very portable tests.
- pass
+ self.send("""
+ <message type="error">
+ <error type="cancel">
+ <undefined-condition
+ xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
+ <text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">
+ SleekXMPP got into trouble.
+ </text>
+ </error>
+ </message>
+ """)
+
+ self.assertEqual(raised_errors, [True], "Exception was not raised: %s" % raised_errors)
+
suite = unittest.TestLoader().loadTestsFromTestCase(TestStreamExceptions)