[telepathy-gabble/master] Define 'jabber:iq:roster' in ns.py
Will Thompson
will.thompson at collabora.co.uk
Thu May 21 04:10:35 PDT 2009
---
.../twisted/file-transfer/file_transfer_helper.py | 2 +-
tests/twisted/ns.py | 1 +
tests/twisted/presence/presence.py | 3 ++-
tests/twisted/roster/ensure.py | 3 ++-
tests/twisted/roster/groups-12791.py | 3 ++-
tests/twisted/roster/groups.py | 3 ++-
tests/twisted/roster/request-group-after-roster.py | 3 ++-
.../twisted/roster/request-group-before-roster.py | 3 ++-
tests/twisted/roster/test-google-roster.py | 7 ++++---
tests/twisted/roster/test-roster-item-deletion.py | 5 +++--
tests/twisted/roster/test-roster-subscribe.py | 5 +++--
tests/twisted/roster/test-roster.py | 3 ++-
tests/twisted/roster/test-save-alias-to-roster.py | 7 ++++---
tests/twisted/tubes/accept-private-dbus-tube.py | 2 +-
tests/twisted/tubes/accept-private-stream-tube.py | 2 +-
tests/twisted/tubes/crash-on-list-channels.py | 2 +-
tests/twisted/tubes/ensure-si-tube.py | 2 +-
tests/twisted/tubes/offer-no-caps.py | 3 ++-
tests/twisted/tubes/offer-private-stream-tube.py | 2 +-
tests/twisted/vcard/test-avatar-tokens.py | 3 ++-
20 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/tests/twisted/file-transfer/file_transfer_helper.py b/tests/twisted/file-transfer/file_transfer_helper.py
index 8fa5bcd..a25ce20 100644
--- a/tests/twisted/file-transfer/file_transfer_helper.py
+++ b/tests/twisted/file-transfer/file_transfer_helper.py
@@ -58,7 +58,7 @@ class FileTransferTest(object):
EventPattern('dbus-signal', signal='StatusChanged', args=[0, 1]),
EventPattern('stream-iq', to=None, query_ns='vcard-temp',
query_name='vCard'),
- EventPattern('stream-iq', query_ns='jabber:iq:roster'),
+ EventPattern('stream-iq', query_ns=ns.ROSTER),
EventPattern('stream-iq', to='localhost', query_ns=ns.DISCO_ITEMS))
roster = roster_event.stanza
diff --git a/tests/twisted/ns.py b/tests/twisted/ns.py
index 9655247..9171e7e 100644
--- a/tests/twisted/ns.py
+++ b/tests/twisted/ns.py
@@ -30,6 +30,7 @@ OLPC_CURRENT_ACTIVITY = "http://laptop.org/xmpp/current-activity"
OLPC_CURRENT_ACTIVITY_NOTIFY = "%s+notify" % OLPC_CURRENT_ACTIVITY
PUBSUB = "http://jabber.org/protocol/pubsub"
REGISTER = "jabber:iq:register"
+ROSTER = "jabber:iq:roster"
SI = 'http://jabber.org/protocol/si'
SI_MULTIPLE = 'http://telepathy.freedesktop.org/xmpp/si-multiple'
STANZA = "urn:ietf:params:xml:ns:xmpp-stanzas"
diff --git a/tests/twisted/presence/presence.py b/tests/twisted/presence/presence.py
index 2c2f211..0235be9 100644
--- a/tests/twisted/presence/presence.py
+++ b/tests/twisted/presence/presence.py
@@ -7,6 +7,7 @@ FIXME: test C.I.Presence too
from twisted.words.xish import domish
from gabbletest import exec_test
+import ns
def test(q, bus, conn, stream):
conn.Connect()
@@ -14,7 +15,7 @@ def test(q, bus, conn, stream):
amy_handle = conn.RequestHandles(1, ['amy at foo.com'])[0]
- event = q.expect('stream-iq', query_ns='jabber:iq:roster')
+ event = q.expect('stream-iq', query_ns=ns.ROSTER)
event.stanza['type'] = 'result'
item = event.query.addElement('item')
diff --git a/tests/twisted/roster/ensure.py b/tests/twisted/roster/ensure.py
index 8b3b67e..752bac0 100644
--- a/tests/twisted/roster/ensure.py
+++ b/tests/twisted/roster/ensure.py
@@ -5,12 +5,13 @@ Test ensuring roster channels
from gabbletest import exec_test
from servicetest import call_async
import constants as cs
+import ns
def test(q, bus, conn, stream):
conn.Connect()
# q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
- roster_event = q.expect('stream-iq', query_ns='jabber:iq:roster')
+ roster_event = q.expect('stream-iq', query_ns=ns.ROSTER)
roster_event.stanza['type'] = 'result'
call_async(q, conn, "RequestHandles", cs.HT_GROUP, ['test'])
diff --git a/tests/twisted/roster/groups-12791.py b/tests/twisted/roster/groups-12791.py
index 6bd6cec..6bbe443 100644
--- a/tests/twisted/roster/groups-12791.py
+++ b/tests/twisted/roster/groups-12791.py
@@ -6,6 +6,7 @@ import dbus
from gabbletest import exec_test, expect_list_channel
import constants as cs
+import ns
def _expect_group_channel(q, bus, conn, name, contacts):
event = q.expect('dbus-signal', signal='NewChannel')
@@ -23,7 +24,7 @@ def test(q, bus, conn, stream):
conn.Connect()
# q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
- event = q.expect('stream-iq', query_ns='jabber:iq:roster')
+ event = q.expect('stream-iq', query_ns=ns.ROSTER)
event.stanza['type'] = 'result'
item = event.query.addElement('item')
diff --git a/tests/twisted/roster/groups.py b/tests/twisted/roster/groups.py
index bde2635..8a42bef 100644
--- a/tests/twisted/roster/groups.py
+++ b/tests/twisted/roster/groups.py
@@ -6,12 +6,13 @@ import dbus
from gabbletest import exec_test, expect_list_channel, expect_group_channel
import constants as cs
+import ns
def test(q, bus, conn, stream):
conn.Connect()
# q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
- event = q.expect('stream-iq', query_ns='jabber:iq:roster')
+ event = q.expect('stream-iq', query_ns=ns.ROSTER)
event.stanza['type'] = 'result'
item = event.query.addElement('item')
diff --git a/tests/twisted/roster/request-group-after-roster.py b/tests/twisted/roster/request-group-after-roster.py
index 3bf4643..3eb3df2 100644
--- a/tests/twisted/roster/request-group-after-roster.py
+++ b/tests/twisted/roster/request-group-after-roster.py
@@ -6,12 +6,13 @@ channel after the roster has been received.
from gabbletest import exec_test, sync_stream
from servicetest import sync_dbus, call_async
import constants as cs
+import ns
def test(q, bus, conn, stream):
conn.Connect()
# q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
- roster_event = q.expect('stream-iq', query_ns='jabber:iq:roster')
+ roster_event = q.expect('stream-iq', query_ns=ns.ROSTER)
roster_event.stanza['type'] = 'result'
call_async(q, conn, "RequestHandles", cs.HT_GROUP, ['test'])
diff --git a/tests/twisted/roster/request-group-before-roster.py b/tests/twisted/roster/request-group-before-roster.py
index 74860ef..0b72970 100644
--- a/tests/twisted/roster/request-group-before-roster.py
+++ b/tests/twisted/roster/request-group-before-roster.py
@@ -6,12 +6,13 @@ group channel if the roster hasn't been received at the time of the call.
from gabbletest import exec_test, sync_stream
from servicetest import sync_dbus, call_async
import constants as cs
+import ns
def test(q, bus, conn, stream):
conn.Connect()
# q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
- roster_event = q.expect('stream-iq', query_ns='jabber:iq:roster')
+ roster_event = q.expect('stream-iq', query_ns=ns.ROSTER)
roster_event.stanza['type'] = 'result'
call_async(q, conn, "RequestHandles", cs.HT_GROUP, ['test'])
diff --git a/tests/twisted/roster/test-google-roster.py b/tests/twisted/roster/test-google-roster.py
index b06162d..55de3b5 100644
--- a/tests/twisted/roster/test-google-roster.py
+++ b/tests/twisted/roster/test-google-roster.py
@@ -7,13 +7,14 @@ import dbus
from gabbletest import acknowledge_iq, exec_test
import constants as cs
+import ns
from twisted.words.protocols.jabber.client import IQ
from twisted.words.xish import domish
def make_set_roster_iq(stream, user, contact, state, ask):
iq = IQ(stream, 'set')
- query = iq.addElement(('jabber:iq:roster', 'query'))
+ query = iq.addElement((ns.ROSTER, 'query'))
item = query.addElement('item')
item['jid'] = contact
item['subscription'] = state
@@ -25,7 +26,7 @@ def make_set_roster_iq(stream, user, contact, state, ask):
def test(q, bus, conn, stream):
conn.Connect()
- event = q.expect('stream-iq', query_ns='jabber:iq:roster')
+ event = q.expect('stream-iq', query_ns=ns.ROSTER)
# send back empty roster
event.stanza['type'] = 'result'
stream.send(event.stanza)
@@ -49,7 +50,7 @@ def test(q, bus, conn, stream):
handle = conn.RequestHandles(1, ['bob at foo.com'])[0]
group_iface.AddMembers([handle], '')
- event = q.expect('stream-iq', iq_type='set', query_ns='jabber:iq:roster')
+ event = q.expect('stream-iq', iq_type='set', query_ns=ns.ROSTER)
item = event.query.firstChildElement()
assert item["jid"] == 'bob at foo.com'
diff --git a/tests/twisted/roster/test-roster-item-deletion.py b/tests/twisted/roster/test-roster-item-deletion.py
index d7ff97b..ee0e81a 100644
--- a/tests/twisted/roster/test-roster-item-deletion.py
+++ b/tests/twisted/roster/test-roster-item-deletion.py
@@ -7,6 +7,7 @@ import dbus
from twisted.words.protocols.jabber.client import IQ
from gabbletest import exec_test, acknowledge_iq, expect_list_channel
+import ns
def test(q, bus, conn, stream):
conn.Connect()
@@ -15,13 +16,13 @@ def test(q, bus, conn, stream):
iq = IQ(stream, "set")
iq['id'] = 'push'
query = iq.addElement('query')
- query['xmlns'] = 'jabber:iq:roster'
+ query['xmlns'] = ns.ROSTER
item = query.addElement('item')
item['jid'] = jid
item['subscription'] = subscription
stream.send(iq)
- event = q.expect('stream-iq', query_ns='jabber:iq:roster')
+ event = q.expect('stream-iq', query_ns=ns.ROSTER)
event.stanza['type'] = 'result'
item = event.query.addElement('item')
diff --git a/tests/twisted/roster/test-roster-subscribe.py b/tests/twisted/roster/test-roster-subscribe.py
index 42525d6..44a1f49 100644
--- a/tests/twisted/roster/test-roster-subscribe.py
+++ b/tests/twisted/roster/test-roster-subscribe.py
@@ -10,11 +10,12 @@ from twisted.words.xish import domish
from servicetest import EventPattern
from gabbletest import acknowledge_iq, exec_test
import constants as cs
+import ns
def test(q, bus, conn, stream):
conn.Connect()
- event = q.expect('stream-iq', query_ns='jabber:iq:roster')
+ event = q.expect('stream-iq', query_ns=ns.ROSTER)
# send back empty roster
event.stanza['type'] = 'result'
stream.send(event.stanza)
@@ -38,7 +39,7 @@ def test(q, bus, conn, stream):
handle = conn.RequestHandles(1, ['bob at foo.com'])[0]
group_iface.AddMembers([handle], '')
- event = q.expect('stream-iq', iq_type='set', query_ns='jabber:iq:roster')
+ event = q.expect('stream-iq', iq_type='set', query_ns=ns.ROSTER)
item = event.query.firstChildElement()
assert item["jid"] == 'bob at foo.com'
diff --git a/tests/twisted/roster/test-roster.py b/tests/twisted/roster/test-roster.py
index 6a5df44..75b1904 100644
--- a/tests/twisted/roster/test-roster.py
+++ b/tests/twisted/roster/test-roster.py
@@ -5,12 +5,13 @@ Test basic roster functionality.
import dbus
from gabbletest import exec_test, expect_list_channel
+import ns
def test(q, bus, conn, stream):
conn.Connect()
# q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
- event = q.expect('stream-iq', query_ns='jabber:iq:roster')
+ event = q.expect('stream-iq', query_ns=ns.ROSTER)
event.stanza['type'] = 'result'
item = event.query.addElement('item')
diff --git a/tests/twisted/roster/test-save-alias-to-roster.py b/tests/twisted/roster/test-save-alias-to-roster.py
index d0a1e97..853e7ad 100644
--- a/tests/twisted/roster/test-save-alias-to-roster.py
+++ b/tests/twisted/roster/test-save-alias-to-roster.py
@@ -8,6 +8,7 @@ import dbus
from servicetest import EventPattern, call_async
from gabbletest import acknowledge_iq, exec_test, make_result_iq
import constants as cs
+import ns
def test(q, bus, conn, stream):
conn.Connect()
@@ -15,7 +16,7 @@ def test(q, bus, conn, stream):
EventPattern('dbus-signal', signal='StatusChanged', args=[0, 1]),
EventPattern('stream-iq', to=None, query_ns='vcard-temp',
query_name='vCard'),
- EventPattern('stream-iq', query_ns='jabber:iq:roster'))
+ EventPattern('stream-iq', query_ns=ns.ROSTER))
acknowledge_iq(stream, event.stanza)
acknowledge_iq(stream, event2.stanza)
@@ -39,7 +40,7 @@ def test(q, bus, conn, stream):
handle = conn.RequestHandles(1, ['bob at foo.com'])[0]
group_iface.AddMembers([handle], '')
- event = q.expect('stream-iq', iq_type='set', query_ns='jabber:iq:roster')
+ event = q.expect('stream-iq', iq_type='set', query_ns=ns.ROSTER)
item = event.query.firstChildElement()
acknowledge_iq(stream, event.stanza)
@@ -59,7 +60,7 @@ def test(q, bus, conn, stream):
content='Bobby')
stream.send(result)
- event = q.expect('stream-iq', iq_type='set', query_ns='jabber:iq:roster')
+ event = q.expect('stream-iq', iq_type='set', query_ns=ns.ROSTER)
item = event.query.firstChildElement()
assert item['jid'] == 'bob at foo.com'
assert item['name'] == 'Bobby'
diff --git a/tests/twisted/tubes/accept-private-dbus-tube.py b/tests/twisted/tubes/accept-private-dbus-tube.py
index 5dd4624..3165d8c 100644
--- a/tests/twisted/tubes/accept-private-dbus-tube.py
+++ b/tests/twisted/tubes/accept-private-dbus-tube.py
@@ -34,7 +34,7 @@ def test(q, bus, conn, stream, bytestream_cls):
EventPattern('dbus-signal', signal='StatusChanged', args=[0, 1]),
EventPattern('stream-iq', to=None, query_ns='vcard-temp',
query_name='vCard'),
- EventPattern('stream-iq', query_ns='jabber:iq:roster'))
+ EventPattern('stream-iq', query_ns=ns.ROSTER))
self_handle = conn.GetSelfHandle()
diff --git a/tests/twisted/tubes/accept-private-stream-tube.py b/tests/twisted/tubes/accept-private-stream-tube.py
index 33c42d2..02b156d 100644
--- a/tests/twisted/tubes/accept-private-stream-tube.py
+++ b/tests/twisted/tubes/accept-private-stream-tube.py
@@ -118,7 +118,7 @@ def test(q, bus, conn, stream, bytestream_cls,
EventPattern('dbus-signal', signal='StatusChanged', args=[0, 1]),
EventPattern('stream-iq', to=None, query_ns='vcard-temp',
query_name='vCard'),
- EventPattern('stream-iq', query_ns='jabber:iq:roster'),
+ EventPattern('stream-iq', query_ns=ns.ROSTER),
EventPattern('stream-iq', to='localhost', query_ns=ns.DISCO_ITEMS))
acknowledge_iq(stream, vcard_event.stanza)
diff --git a/tests/twisted/tubes/crash-on-list-channels.py b/tests/twisted/tubes/crash-on-list-channels.py
index 9c33ce0..2b099b2 100644
--- a/tests/twisted/tubes/crash-on-list-channels.py
+++ b/tests/twisted/tubes/crash-on-list-channels.py
@@ -19,7 +19,7 @@ def test(q, bus, conn, stream):
conn.Connect()
_, roster_event = q.expect_many(
EventPattern('dbus-signal', signal='StatusChanged', args=[0, 1]),
- EventPattern('stream-iq', query_ns='jabber:iq:roster'))
+ EventPattern('stream-iq', query_ns=ns.ROSTER))
roster = roster_event.stanza
roster['type'] = 'result'
diff --git a/tests/twisted/tubes/ensure-si-tube.py b/tests/twisted/tubes/ensure-si-tube.py
index 27a43c2..f472686 100644
--- a/tests/twisted/tubes/ensure-si-tube.py
+++ b/tests/twisted/tubes/ensure-si-tube.py
@@ -38,7 +38,7 @@ def test(q, bus, conn, stream):
EventPattern('dbus-signal', signal='StatusChanged', args=[0, 1]),
EventPattern('stream-iq', to=None, query_ns='vcard-temp',
query_name='vCard'),
- EventPattern('stream-iq', query_ns='jabber:iq:roster'))
+ EventPattern('stream-iq', query_ns=ns.ROSTER))
acknowledge_iq(stream, vcard_event.stanza)
diff --git a/tests/twisted/tubes/offer-no-caps.py b/tests/twisted/tubes/offer-no-caps.py
index 9ac365a..c659ac3 100644
--- a/tests/twisted/tubes/offer-no-caps.py
+++ b/tests/twisted/tubes/offer-no-caps.py
@@ -12,6 +12,7 @@ from gabbletest import exec_test, acknowledge_iq, sync_stream
import constants as cs
import tubetestutil as t
+import ns
def props(ct, extra=None):
ret = { cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
@@ -29,7 +30,7 @@ def test(q, bus, conn, stream):
EventPattern('dbus-signal', signal='StatusChanged', args=[0, 1]),
EventPattern('stream-iq', to=None, query_ns='vcard-temp',
query_name='vCard'),
- EventPattern('stream-iq', query_ns='jabber:iq:roster'))
+ EventPattern('stream-iq', query_ns=ns.ROSTER))
acknowledge_iq(stream, vcard_event.stanza)
diff --git a/tests/twisted/tubes/offer-private-stream-tube.py b/tests/twisted/tubes/offer-private-stream-tube.py
index 5b2c2bf..7e75aa5 100644
--- a/tests/twisted/tubes/offer-private-stream-tube.py
+++ b/tests/twisted/tubes/offer-private-stream-tube.py
@@ -52,7 +52,7 @@ def test(q, bus, conn, stream, bytestream_cls,
EventPattern('dbus-signal', signal='StatusChanged', args=[0, 1]),
EventPattern('stream-iq', to=None, query_ns='vcard-temp',
query_name='vCard'),
- EventPattern('stream-iq', query_ns='jabber:iq:roster'))
+ EventPattern('stream-iq', query_ns=ns.ROSTER))
self_handle = conn.GetSelfHandle()
diff --git a/tests/twisted/vcard/test-avatar-tokens.py b/tests/twisted/vcard/test-avatar-tokens.py
index 4137f48..7fef5fd 100644
--- a/tests/twisted/vcard/test-avatar-tokens.py
+++ b/tests/twisted/vcard/test-avatar-tokens.py
@@ -7,6 +7,7 @@ from twisted.words.xish import domish
from servicetest import unwrap, EventPattern
from gabbletest import exec_test, make_result_iq
+import ns
def make_presence(jid, sha1sum):
p = domish.Element((None, 'presence'))
@@ -20,7 +21,7 @@ def test(q, bus, conn, stream):
conn.Connect()
_, event = q.expect_many(
EventPattern('dbus-signal', signal='StatusChanged', args=[0, 1]),
- EventPattern('stream-iq', to=None, query_ns='jabber:iq:roster',
+ EventPattern('stream-iq', to=None, query_ns=ns.ROSTER,
query_name='query'))
result = make_result_iq(stream, event.stanza)
--
1.5.6.5
More information about the telepathy-commits
mailing list