summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-07-03 00:39:14 -0700
committerLance Stout <lancestout@gmail.com>2011-07-03 00:39:14 -0700
commit20df6348a4c8262a40578d84c934f9a15431d925 (patch)
treec6dc62a271c0125bf623a2376cc64c08e00ae7ad /tests
parent847510c6b577f889cdba5deaa0bb271475cc7c7f (diff)
parent086bf89d699c88ab89ad1e1975d6022335ca5c04 (diff)
downloadslixmpp-20df6348a4c8262a40578d84c934f9a15431d925.tar.gz
slixmpp-20df6348a4c8262a40578d84c934f9a15431d925.tar.bz2
slixmpp-20df6348a4c8262a40578d84c934f9a15431d925.tar.xz
slixmpp-20df6348a4c8262a40578d84c934f9a15431d925.zip
Merge branch 'develop' into exceptions
Diffstat (limited to 'tests')
-rw-r--r--tests/test_stream_exceptions.py99
-rw-r--r--tests/test_stream_xep_0030.py14
-rw-r--r--tests/test_stream_xep_0066.py72
-rw-r--r--tests/test_stream_xep_0128.py1
-rw-r--r--tests/test_stream_xep_0249.py1
5 files changed, 174 insertions, 13 deletions
diff --git a/tests/test_stream_exceptions.py b/tests/test_stream_exceptions.py
index 1143ce28..c41edbb2 100644
--- a/tests/test_stream_exceptions.py
+++ b/tests/test_stream_exceptions.py
@@ -12,7 +12,6 @@ class TestStreamExceptions(SleekTest):
"""
def tearDown(self):
- sys.excepthook = sys.__excepthook__
self.stream_close()
def testExceptionReply(self):
@@ -23,8 +22,33 @@ class TestStreamExceptions(SleekTest):
msg['body'] = 'Body changed'
raise XMPPError(clear=False)
+ self.stream_start()
+ self.xmpp.add_event_handler('message', message)
+
+ self.recv("""
+ <message>
+ <body>This is going to cause an error.</body>
+ </message>
+ """)
+
+ self.send("""
+ <message type="error">
+ <body>This is going to cause an error.</body>
+ <error type="cancel" code="500">
+ <undefined-condition
+ xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
+ </error>
+ </message>
+ """)
+
+ def testExceptionContinueWorking(self):
+ """Test that Sleek continues to respond after an XMPPError is raised."""
+
+ def message(msg):
+ msg.reply()
+ msg['body'] = 'Body changed'
+ raise XMPPError(clear=False)
- sys.excepthook = lambda *args, **kwargs: None
self.stream_start()
self.xmpp.add_event_handler('message', message)
@@ -44,6 +68,22 @@ class TestStreamExceptions(SleekTest):
</message>
""")
+ self.recv("""
+ <message>
+ <body>This is going to cause an error.</body>
+ </message>
+ """)
+
+ self.send("""
+ <message type="error">
+ <body>This is going to cause an error.</body>
+ <error type="cancel" code="500">
+ <undefined-condition
+ xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
+ </error>
+ </message>
+ """)
+
def testXMPPErrorException(self):
"""Test raising an XMPPError exception."""
@@ -153,9 +193,8 @@ class TestStreamExceptions(SleekTest):
def catch_error(*args, **kwargs):
raised_errors.append(True)
- sys.excepthook = catch_error
-
self.stream_start()
+ self.xmpp.exception = catch_error
self.xmpp.add_event_handler('message', message)
self.recv("""
@@ -178,6 +217,58 @@ class TestStreamExceptions(SleekTest):
self.assertEqual(raised_errors, [True], "Exception was not raised: %s" % raised_errors)
+ def testUnknownException(self):
+ """Test Sleek continues to respond after an unknown exception."""
+
+ raised_errors = []
+
+ def message(msg):
+ raise ValueError("Did something wrong")
+
+ def catch_error(*args, **kwargs):
+ raised_errors.append(True)
+
+ self.stream_start()
+ self.xmpp.exception = catch_error
+ self.xmpp.add_event_handler('message', message)
+
+ self.recv("""
+ <message>
+ <body>This is going to cause an error.</body>
+ </message>
+ """)
+
+ self.send("""
+ <message type="error">
+ <error type="cancel" code="500">
+ <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.recv("""
+ <message>
+ <body>This is going to cause an error.</body>
+ </message>
+ """)
+
+ self.send("""
+ <message type="error">
+ <error type="cancel" code="500">
+ <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, True], "Exceptions were not raised: %s" % raised_errors)
suite = unittest.TestLoader().loadTestsFromTestCase(TestStreamExceptions)
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("""
diff --git a/tests/test_stream_xep_0066.py b/tests/test_stream_xep_0066.py
new file mode 100644
index 00000000..3dbaf840
--- /dev/null
+++ b/tests/test_stream_xep_0066.py
@@ -0,0 +1,72 @@
+import time
+import threading
+
+from sleekxmpp.test import *
+
+
+class TestOOB(SleekTest):
+
+ def tearDown(self):
+ self.stream_close()
+
+ def testSendOOB(self):
+ """Test sending an OOB transfer request."""
+ self.stream_start(plugins=['xep_0066', 'xep_0030'])
+
+ url = 'http://github.com/fritzy/SleekXMPP/blob/master/README'
+
+ t = threading.Thread(
+ name='send_oob',
+ target=self.xmpp['xep_0066'].send_oob,
+ args=('user@example.com', url),
+ kwargs={'desc': 'SleekXMPP README'})
+
+ t.start()
+
+ self.send("""
+ <iq to="user@example.com" type="set" id="1">
+ <query xmlns="jabber:iq:oob">
+ <url>http://github.com/fritzy/SleekXMPP/blob/master/README</url>
+ <desc>SleekXMPP README</desc>
+ </query>
+ </iq>
+ """)
+
+ self.recv("""
+ <iq id="1" type="result"
+ to="tester@localhost"
+ from="user@example.com" />
+ """)
+
+ t.join()
+
+ def testReceiveOOB(self):
+ """Test receiving an OOB request."""
+ self.stream_start(plugins=['xep_0066', 'xep_0030'])
+
+ events = []
+
+ def receive_oob(iq):
+ events.append(iq['oob_transfer']['url'])
+
+ self.xmpp.add_event_handler('oob_transfer', receive_oob)
+
+ self.recv("""
+ <iq to="tester@localhost"
+ from="user@example.com"
+ type="set" id="1">
+ <query xmlns="jabber:iq:oob">
+ <url>http://github.com/fritzy/SleekXMPP/blob/master/README</url>
+ <desc>SleekXMPP README</desc>
+ </query>
+ </iq>
+ """)
+
+ time.sleep(0.1)
+
+ self.assertEqual(events,
+ ['http://github.com/fritzy/SleekXMPP/blob/master/README'],
+ 'URL was not received: %s' % events)
+
+
+suite = unittest.TestLoader().loadTestsFromTestCase(TestOOB)
diff --git a/tests/test_stream_xep_0128.py b/tests/test_stream_xep_0128.py
index 6fee6556..42fc9143 100644
--- a/tests/test_stream_xep_0128.py
+++ b/tests/test_stream_xep_0128.py
@@ -13,7 +13,6 @@ class TestStreamExtendedDisco(SleekTest):
"""
def tearDown(self):
- sys.excepthook = sys.__excepthook__
self.stream_close()
def testUsingExtendedInfo(self):
diff --git a/tests/test_stream_xep_0249.py b/tests/test_stream_xep_0249.py
index f49d1f7e..9a25253f 100644
--- a/tests/test_stream_xep_0249.py
+++ b/tests/test_stream_xep_0249.py
@@ -13,7 +13,6 @@ class TestStreamDirectInvite(SleekTest):
"""
def tearDown(self):
- sys.excepthook = sys.__excepthook__
self.stream_close()
def testReceiveInvite(self):
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 14:31:00 +0000