summaryrefslogtreecommitdiff
path: root/tests/test_stream_roster.py
diff options
context:
space:
mode:
authorAnton Ryzhov <anton@ryzhov.me>2013-03-28 21:05:37 +0400
committerAnton Ryzhov <anton@ryzhov.me>2013-03-28 22:09:33 +0400
commitc0d02d99354780dfd0ca1cfa96222c626eb3be48 (patch)
tree992b789bc4a2f2281ec284798dadd32d9091b424 /tests/test_stream_roster.py
parent01356d23e5468ca8cc6f3edf37f847f04f35a70d (diff)
downloadslixmpp-c0d02d99354780dfd0ca1cfa96222c626eb3be48.tar.gz
slixmpp-c0d02d99354780dfd0ca1cfa96222c626eb3be48.tar.bz2
slixmpp-c0d02d99354780dfd0ca1cfa96222c626eb3be48.tar.xz
slixmpp-c0d02d99354780dfd0ca1cfa96222c626eb3be48.zip
Remove `roster_received` event
Diffstat (limited to 'tests/test_stream_roster.py')
-rw-r--r--tests/test_stream_roster.py17
1 files changed, 5 insertions, 12 deletions
diff --git a/tests/test_stream_roster.py b/tests/test_stream_roster.py
index 652ea1ce..3d1447a3 100644
--- a/tests/test_stream_roster.py
+++ b/tests/test_stream_roster.py
@@ -19,16 +19,9 @@ class TestStreamRoster(SleekTest):
"""Test handling roster requests."""
self.stream_start(mode='client', jid='tester@localhost')
- events = []
-
- def roster_received(iq):
- events.append('roster_received')
+ roster_updates = []
- def roster_update(iq):
- events.append('roster_update')
-
- self.xmpp.add_event_handler('roster_received', roster_received)
- self.xmpp.add_event_handler('roster_update', roster_update)
+ self.xmpp.add_event_handler('roster_update', roster_updates.append)
# Since get_roster blocks, we need to run it in a thread.
t = threading.Thread(name='get_roster', target=self.xmpp.get_roster)
@@ -66,8 +59,8 @@ class TestStreamRoster(SleekTest):
# Give the event queue time to process.
time.sleep(.1)
- self.failUnless(events == ['roster_received', 'roster_update'],
- "Wrong roster events fired: %s" % events)
+ self.failUnless(len(roster_updates) == 1,
+ "Wrong number of roster_update events fired: %s (should be 1)" % len(roster_updates))
def testRosterSet(self):
"""Test handling pushed roster updates."""
@@ -156,7 +149,7 @@ class TestStreamRoster(SleekTest):
"""Test rejecting a roster push from an unauthorized source."""
self.stream_start()
self.recv("""
- <iq to='tester@localhost' from="malicious_user@localhost"
+ <iq to='tester@localhost' from="malicious_user@localhost"
type="set" id="1">
<query xmlns="jabber:iq:roster">
<item jid="user@localhost"