Merge branch 'develop' into stream_features

Conflicts:
	sleekxmpp/clientxmpp.py

2 files changed, 91 insertions, 5 deletions

diff --git a/tests/test_stanza_error.py b/tests/test_stanza_error.py
index e1c7d5a4..a41bf4bf 100644
--- a/tests/test_stanza_error.py
+++ b/tests/test_stanza_error.py
@@ -3,13 +3,18 @@ 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()
         msg.enable('error')
         self.check(msg, """
           <message type="error">
-            <error type="cancel">
+            <error type="cancel" code="501">
               <feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
             </error>
           </message>
@@ -22,7 +27,7 @@ class TestErrorStanzas(SleekTest):
 
         self.check(msg, """
           <message type="error">
-            <error type="cancel">
+            <error type="cancel" code="404">
               <item-not-found xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
             </error>
           </message>
@@ -34,7 +39,7 @@ class TestErrorStanzas(SleekTest):
 
         self.check(msg, """
           <message type="error">
-            <error type="cancel">
+            <error type="wait" code="500">
               <resource-constraint xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
             </error>
           </message>
@@ -50,7 +55,7 @@ class TestErrorStanzas(SleekTest):
 
         self.check(msg, """
           <message type="error">
-            <error type="cancel">
+            <error type="wait" code="500">
               <text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">Error!</text>
             </error>
           </message>
@@ -66,7 +71,7 @@ class TestErrorStanzas(SleekTest):
 
         self.check(msg, """
           <message type="error">
-            <error type="cancel">
+            <error type="wait" code="500">
               <internal-server-error xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" />
             </error>
           </message>
diff --git a/tests/test_stream_roster.py b/tests/test_stream_roster.py
index 165a8bc9..731d1145 100644
--- a/tests/test_stream_roster.py
+++ b/tests/test_stream_roster.py
@@ -16,6 +16,13 @@ class TestStreamRoster(SleekTest):
         self.stream_start(mode='client')
         self.failUnless(self.xmpp.roster == {}, "Initial roster not empty.")
 
+        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()
@@ -41,6 +48,9 @@ class TestStreamRoster(SleekTest):
         # Wait for get_roster to return.
         t.join()
 
+        # Give the event queue time to process.
+        time.sleep(.1)
+
         roster = {'user@localhost': {'name': 'User',
                                      'subscription': 'both',
                                      'groups': ['Friends', 'Examples'],
@@ -48,11 +58,20 @@ class TestStreamRoster(SleekTest):
                                      'in_roster': True}}
         self.failUnless(self.xmpp.roster == roster,
                 "Unexpected roster values: %s" % self.xmpp.roster)
+        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')
         self.failUnless(self.xmpp.roster == {}, "Initial roster not empty.")
+        events = []
+
+        def roster_update(e):
+            events.append('roster_update')
+
+        self.xmpp.add_event_handler('roster_update', roster_update)
+
 
         self.recv("""
           <iq type="set" id="1">
@@ -72,6 +91,9 @@ class TestStreamRoster(SleekTest):
           </iq>
         """)
 
+        # Give the event queue time to process.
+        time.sleep(.1)
+
         roster = {'user@localhost': {'name': 'User',
                                      'subscription': 'both',
                                      'groups': ['Friends', 'Examples'],
@@ -79,7 +101,66 @@ class TestStreamRoster(SleekTest):
                                      'in_roster': True}}
         self.failUnless(self.xmpp.roster == roster,
                 "Unexpected roster values: %s" % self.xmpp.roster)
+        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)