[Telepathy-commits] [telepathy-gabble/master] fix test-olpc-set-props-preload.py
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Tue Aug 19 10:52:51 PDT 2008
20080529110657-7fe3f-fdb9b4910462d519028d1af39ae107e379416aac.gz
---
tests/twisted/olpc/test-olpc-set-props-preload.py | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/tests/twisted/olpc/test-olpc-set-props-preload.py b/tests/twisted/olpc/test-olpc-set-props-preload.py
index 56ec1be..d9e774b 100644
--- a/tests/twisted/olpc/test-olpc-set-props-preload.py
+++ b/tests/twisted/olpc/test-olpc-set-props-preload.py
@@ -16,13 +16,19 @@ def test(q, bus, conn, stream):
conn.Connect()
# q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
- event = q.expect('stream-iq')
+ # buddy activities
+ event = q.expect('stream-iq', iq_type='set', query_name='pubsub')
+
+ # activity properties
+ event = q.expect('stream-iq', iq_type='set', query_name='pubsub')
+
+ # buddy properties
+ event = q.expect('stream-iq', iq_type='set', query_name='pubsub')
iq = event.stanza
nodes = xpath.queryForNodes(
"/iq[@type='set']/pubsub[@xmlns='http://jabber.org/protocol/pubsub']"
"/publish[@node='http://laptop.org/xmpp/buddy-properties']", iq)
- if not nodes:
- return False
+ assert nodes
nodes = xpath.queryForNodes(
"/publish/item"
@@ -38,7 +44,6 @@ def test(q, bus, conn, stream):
iq['type'] = 'result'
stream.send(iq)
conn.Disconnect()
- return True
if __name__ == '__main__':
exec_test(test)
--
1.5.6.3
More information about the Telepathy-commits
mailing list