summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-05-20 13:23:48 -0400
committerLance Stout <lancestout@gmail.com>2011-05-20 13:23:48 -0400
commite3b14bc5a9fde7037b309359be8ff1abf5447735 (patch)
tree616dab4df473cde21edf33f52537b7d66bc21b45 /tests
parent8e46aa70543eb6cc003b69877e7677480db3a4dc (diff)
parent9f1648328f17b608651989606b9cf2636cdcfbec (diff)
downloadslixmpp-e3b14bc5a9fde7037b309359be8ff1abf5447735.tar.gz
slixmpp-e3b14bc5a9fde7037b309359be8ff1abf5447735.tar.bz2
slixmpp-e3b14bc5a9fde7037b309359be8ff1abf5447735.tar.xz
slixmpp-e3b14bc5a9fde7037b309359be8ff1abf5447735.zip
Merge branch 'develop' into roster
Conflicts: sleekxmpp/clientxmpp.py tests/test_stream_roster.py
Diffstat (limited to 'tests')
-rw-r--r--tests/test_stanza_error.py5
-rw-r--r--tests/test_stream_roster.py85
2 files changed, 89 insertions, 1 deletions
diff --git a/tests/test_stanza_error.py b/tests/test_stanza_error.py
index 5eecfee9..a41bf4bf 100644
--- a/tests/test_stanza_error.py
+++ b/tests/test_stanza_error.py
@@ -3,6 +3,11 @@ from sleekxmpp.test import *
class TestErrorStanzas(SleekTest):
+ def setUp(self):
+ # Ensure that the XEP-0086 plugin has been loaded.
+ self.stream_start()
+ self.stream_close()
+
def testSetup(self):
"""Test setting initial values in error stanza."""
msg = self.Message()
diff --git a/tests/test_stream_roster.py b/tests/test_stream_roster.py
index dffd6713..28d07b51 100644
--- a/tests/test_stream_roster.py
+++ b/tests/test_stream_roster.py
@@ -15,6 +15,13 @@ class TestStreamRoster(SleekTest):
"""Test handling roster requests."""
self.stream_start(mode='client', jid='tester@localhost')
+ events = []
+
+ def roster_received(iq):
+ events.append('roster_received')
+
+ self.xmpp.add_event_handler('roster_received', roster_received)
+
# Since get_roster blocks, we need to run it in a thread.
t = threading.Thread(name='get_roster', target=self.xmpp.get_roster)
t.start()
@@ -48,9 +55,21 @@ class TestStreamRoster(SleekTest):
pending_out=True,
groups=['Friends', 'Examples'])
+ # Give the event queue time to process.
+ time.sleep(.1)
+
+ self.failUnless('roster_received' in events,
+ "Roster received event not triggered: %s" % events)
+
def testRosterSet(self):
"""Test handling pushed roster updates."""
- self.stream_start(mode='client', jid='tester@localhost')
+ self.stream_start(mode='client')
+ events = []
+
+ def roster_update(e):
+ events.append('roster_update')
+
+ self.xmpp.add_event_handler('roster_update', roster_update)
self.recv("""
<iq to='tester@localhost' type="set" id="1">
@@ -75,5 +94,69 @@ class TestStreamRoster(SleekTest):
subscription='both',
groups=['Friends', 'Examples'])
+ # Give the event queue time to process.
+ time.sleep(.1)
+
+ self.failUnless('roster_update' in events,
+ "Roster updated event not triggered: %s" % events)
+
+ def testRosterTimeout(self):
+ """Test handling a timed out roster request."""
+ self.stream_start()
+ events = []
+
+ def roster_timeout(event):
+ events.append('roster_timeout')
+
+ self.xmpp.add_event_handler('roster_timeout', roster_timeout)
+ self.xmpp.get_roster(timeout=0)
+
+ # Give the event queue time to process.
+ time.sleep(.1)
+
+ self.failUnless(events == ['roster_timeout'],
+ "Roster timeout event not triggered: %s." % events)
+
+ def testRosterCallback(self):
+ """Test handling a roster request callback."""
+ self.stream_start()
+ events = []
+
+ def roster_callback(iq):
+ events.append('roster_callback')
+
+ # Since get_roster blocks, we need to run it in a thread.
+ t = threading.Thread(name='get_roster',
+ target=self.xmpp.get_roster,
+ kwargs={'callback': roster_callback})
+ t.start()
+
+ self.send("""
+ <iq type="get" id="1">
+ <query xmlns="jabber:iq:roster" />
+ </iq>
+ """)
+ self.recv("""
+ <iq type="result" id="1">
+ <query xmlns="jabber:iq:roster">
+ <item jid="user@localhost"
+ name="User"
+ subscription="both">
+ <group>Friends</group>
+ <group>Examples</group>
+ </item>
+ </query>
+ </iq>
+ """)
+
+ # Wait for get_roster to return.
+ t.join()
+
+ # Give the event queue time to process.
+ time.sleep(.1)
+
+ self.failUnless(events == ['roster_callback'],
+ "Roster timeout event not triggered: %s." % events)
+
suite = unittest.TestLoader().loadTestsFromTestCase(TestStreamRoster)