test-muc.py: use new IQ event attributestelepathy-gabble-0.5.12

20070615130113-c9803-feee0cb03b2b51e0434c0ed293399567c1f9e15b.gz

1 files changed, 5 insertions, 14 deletions

diff --git a/tests/test-muc.py b/tests/test-muc.py
index 2e13a3191..2fe647c30 100644
--- a/tests/test-muc.py
+++ b/tests/test-muc.py
@@ -18,23 +18,14 @@ def expect_connected(event, data):
         ['chat@conf.localhost'])
     return True
 
-@match('stream-iq')
+@match('stream-iq', to='conf.localhost',
+    query_ns='http://jabber.org/protocol/disco#info')
 def expect_disco(event, data):
-    iq = event.stanza
-    nodes = xpath.queryForNodes(
-        "/iq/query[@xmlns='http://jabber.org/protocol/disco#info']", iq)
-
-    if not nodes:
-        return False
-
-    assert iq['to'] == 'conf.localhost'
-
-    query = nodes[0]
-    feature = query.addElement('feature')
+    feature = event.query.addElement('feature')
     feature['var'] = 'http://jabber.org/protocol/muc'
 
-    iq['type'] = 'result'
-    data['stream'].send(iq)
+    event.stanza['type'] = 'result'
+    data['stream'].send(event.stanza)
     return True
 
 def expect_request_handles_return(event, data):