From 5bdcd9ef9d74d7921f5579086e6c6d94c0ac7deb Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Mon, 25 Oct 2010 15:09:56 -0400 Subject: Made exceptions work. Raising an XMPPError exception from an event handler now works, even if from a threaded handler. Added stream tests to verify. We should start using XMPPError, it really makes things simple! --- tests/test_stream_exceptions.py | 110 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 tests/test_stream_exceptions.py (limited to 'tests/test_stream_exceptions.py') diff --git a/tests/test_stream_exceptions.py b/tests/test_stream_exceptions.py new file mode 100644 index 00000000..f788a3a4 --- /dev/null +++ b/tests/test_stream_exceptions.py @@ -0,0 +1,110 @@ +import sys +import sleekxmpp +from sleekxmpp.exceptions import XMPPError +from sleekxmpp.test import * + + +class TestStreamExceptions(SleekTest): + """ + Test handling roster updates. + """ + + def tearDown(self): + self.stream_close() + + def testXMPPErrorException(self): + """Test raising an XMPPError exception.""" + + def message(msg): + raise XMPPError(condition='feature-not-implemented', + text="We don't do things that way here.", + etype='cancel', + extension='foo', + extension_ns='foo:error', + extension_args={'test': 'true'}) + + self.stream_start() + self.xmpp.add_event_handler('message', message) + + self.stream_recv(""" + + This is going to cause an error. + + """) + + self.stream_send_message(""" + + + + + We don't do things that way here. + + + + + """, use_values=False) + + def testThreadedXMPPErrorException(self): + """Test raising an XMPPError exception in a threaded handler.""" + + def message(msg): + raise XMPPError(condition='feature-not-implemented', + text="We don't do things that way here.", + etype='cancel') + + self.stream_start() + self.xmpp.add_event_handler('message', message, + threaded=True) + + self.stream_recv(""" + + This is going to cause an error. + + """) + + self.stream_send_message(""" + + + + + We don't do things that way here. + + + + """) + + def testUnknownException(self): + """Test raising an generic exception in a threaded handler.""" + + def message(msg): + raise ValueError("Did something wrong") + + self.stream_start() + self.xmpp.add_event_handler('message', message) + + self.stream_recv(""" + + This is going to cause an error. + + """) + + if sys.version_info < (3, 0): + self.stream_send_message(""" + + + + + SleekXMPP got into trouble. + + + + """) + else: + # Unfortunately, tracebacks do not make for very portable tests. + pass + + +suite = unittest.TestLoader().loadTestsFromTestCase(TestStreamExceptions) -- cgit v1.2.3