Changeset 137:8206d7483945 for wokkel

Timestamp:

Aug 3, 2011, 8:54:25 PM (9 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

wokkel-muc-client-support-24

Message:

Use JIDs everywhere and adjust tests.

Location:

wokkel

Files:

• muc.py (modified) (1 diff)
• test/test_muc.py (modified) (2 diffs)

wokkel/muc.py

@@ -363 +363 @@
         self['type'] = 'chat'
         if isinstance(to, jid.JID):
-            self['to'] = to.userhost()
+            self['to'] = to.full()
         else:
             self['to'] = to

wokkel/test/test_muc.py

@@ -404 +404 @@
         Send private messages to muc entities.
         """
-        other_nick = self.room_jid.userhost()+'/OtherNick'
+        other_nick = JID(self.room_jid.userhost()+'/OtherNick')
 
         self.protocol.chat(other_nick, 'This is a test')
@@ -410 +410 @@
         msg = self.stub.output[-1]
 
-        query = "/message[@type='chat' and @to='%s']/body" % other_nick
+        query = "/message[@type='chat' and @to='%s']/body" % other_nick.full()
         self.assertTrue(xpath.matches(query, msg), 'Wrong message type')