diff --git a/tests/test_stream_roster.py b/tests/test_stream_roster.py
index eb6d2f4f..535a0080 100644
--- a/tests/test_stream_roster.py
+++ b/tests/test_stream_roster.py
@@ -104,6 +104,74 @@ class TestStreamRoster(SleekTest):
self.failUnless('roster_update' in events,
"Roster updated event not triggered: %s" % events)
+ def testRosterPushRemove(self):
+ """Test handling roster item removal updates."""
+ self.stream_start(mode='client')
+ events = []
+
+ # Add roster item
+ self.recv("""
+
+
+ -
+ Friends
+ Examples
+
+
+
+ """)
+ self.send("""
+
+
+
+ """)
+
+ self.assertTrue('user@localhost' in self.xmpp.client_roster)
+
+ # Receive item remove push
+ self.recv("""
+
+
+ -
+
+
+
+ """)
+ self.send("""
+
+
+
+ """)
+
+ self.assertTrue('user@localhost' not in self.xmpp.client_roster)
+
+ def testUnauthorizedRosterPush(self):
+ """Test rejecting a roster push from an unauthorized source."""
+ self.stream_start()
+ self.recv("""
+
+
+ -
+ Friends
+ Examples
+
+
+
+ """)
+ self.send("""
+
+
+
+
+
+ """)
+
def testRosterTimeout(self):
"""Test handling a timed out roster request."""
self.stream_start()
@@ -227,5 +295,62 @@ class TestStreamRoster(SleekTest):
""")
+ def testUnsupportedRosterVer(self):
+ """Test working with a server without roster versioning."""
+ self.stream_start()
+ self.assertTrue('rosterver' not in self.xmpp.features)
+
+ t = threading.Thread(name='get_roster', target=self.xmpp.get_roster)
+ t.start()
+ self.send("""
+
+
+
+ """)
+ self.recv("""
+
+ """)
+
+ t.join()
+
+ def testBootstrapRosterVer(self):
+ """Test bootstrapping with roster versioning."""
+ self.stream_start()
+ self.xmpp.features.add('rosterver')
+ self.xmpp.client_roster.version = ''
+
+ t = threading.Thread(name='get_roster', target=self.xmpp.get_roster)
+ t.start()
+ self.send("""
+
+
+
+ """)
+ self.recv("""
+
+ """)
+
+ t.join()
+
+
+ def testExistingRosterVer(self):
+ """Test using a stored roster version."""
+ self.stream_start()
+ self.xmpp.features.add('rosterver')
+ self.xmpp.client_roster.version = '42'
+
+ t = threading.Thread(name='get_roster', target=self.xmpp.get_roster)
+ t.start()
+ self.send("""
+
+
+
+ """)
+ self.recv("""
+
+ """)
+
+ t.join()
+
suite = unittest.TestLoader().loadTestsFromTestCase(TestStreamRoster)