diff --git a/tests/test_stream_roster.py b/tests/test_stream_roster.py
new file mode 100644
index 0000000..6eda7e3
--- /dev/null
+++ b/tests/test_stream_roster.py
@@ -0,0 +1,86 @@
+from sleekxmpp.test import *
+import time
+import threading
+
+
+class TestStreamRoster(SleekTest):
+ """
+ Test handling roster updates.
+ """
+
+ def tearDown(self):
+ self.stream_close()
+
+ def testGetRoster(self):
+ """Test handling roster requests."""
+ self.stream_start(mode='client')
+ self.failUnless(self.xmpp.roster == {}, "Initial roster not empty.")
+
+ # 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()
+
+ self.stream_send_iq("""
+
+
+
+ """)
+ self.stream_recv("""
+
+
+ -
+ Friends
+ Examples
+
+
+
+ """)
+
+ # Wait for get_roster to return.
+ t.join()
+
+ roster = {'user@localhost': {'name': 'User',
+ 'subscription': 'both',
+ 'groups': ['Friends', 'Examples'],
+ 'presence': {},
+ 'in_roster': True}}
+ self.failUnless(self.xmpp.roster == roster,
+ "Unexpected roster values: %s" % self.xmpp.roster)
+
+ def testRosterSet(self):
+ """Test handling pushed roster updates."""
+ self.stream_start(mode='client')
+ self.failUnless(self.xmpp.roster == {}, "Initial roster not empty.")
+
+ self.stream_recv("""
+
+
+ -
+ Friends
+ Examples
+
+
+
+ """)
+ self.stream_send_iq("""
+
+
+
+ """)
+
+ roster = {'user@localhost': {'name': 'User',
+ 'subscription': 'both',
+ 'groups': ['Friends', 'Examples'],
+ 'presence': {},
+ 'in_roster': True}}
+ self.failUnless(self.xmpp.roster == roster,
+ "Unexpected roster values: %s" % self.xmpp.roster)
+
+
+
+
+suite = unittest.TestLoader().loadTestsFromTestCase(TestStreamRoster)