[Telepathy-commits] [telepathy-gabble/master] tests/twisted/roster: expect CreateChannel to return before NewChannel

[Simon McVittie]

Spec 0.17.14 compliance in telepathy-glib 0.7.18
---
 tests/twisted/roster/request-group-after-roster.py |    6 +++---
 .../twisted/roster/request-group-before-roster.py  |   11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/tests/twisted/roster/request-group-after-roster.py b/tests/twisted/roster/request-group-after-roster.py
index 87e28ee..9ab444c 100644
--- a/tests/twisted/roster/request-group-after-roster.py
+++ b/tests/twisted/roster/request-group-after-roster.py
@@ -38,6 +38,9 @@ def test(q, bus, conn, stream):
               'org.freedesktop.Telepathy.Channel.TargetHandle': test_handle,
               })
 
+    event = q.expect('dbus-return', method='CreateChannel')
+    ret_path, ret_props = event.value
+
     event = q.expect('dbus-signal', signal='NewChannels')
     path, props = event.args[0][0]
     assert props['org.freedesktop.Telepathy.Channel.ChannelType'] ==\
@@ -49,9 +52,6 @@ def test(q, bus, conn, stream):
     assert props['org.freedesktop.Telepathy.Channel.TargetID'] ==\
             'test', props
 
-    event = q.expect('dbus-return', method='CreateChannel')
-    ret_path, ret_props = event.value
-
     assert ret_path == path, (ret_path, path)
     assert ret_props == props, (ret_props, props)
 
diff --git a/tests/twisted/roster/request-group-before-roster.py b/tests/twisted/roster/request-group-before-roster.py
index ca02ce3..e764bdc 100644
--- a/tests/twisted/roster/request-group-before-roster.py
+++ b/tests/twisted/roster/request-group-before-roster.py
@@ -40,14 +40,15 @@ def test(q, bus, conn, stream):
     # send an empty roster
     stream.send(roster_event.stanza)
 
+    event = q.expect('dbus-return', method='RequestChannel')
+    path = event.value[0]
+
     while True:
         event = q.expect('dbus-signal', signal='NewChannel')
-        path, type, handle_type, handle, suppress_handler = event.args
+        assert event.args[0] == path, (event.args, path)
+        _, type, handle_type, handle, suppress_handler = event.args
         if handle_type == HT_GROUP and handle == test_handle:
-            break;
-
-    event = q.expect('dbus-return', method='RequestChannel')
-    assert event.value[0] == path, (event.args[0], path)
+            break
 
 if __name__ == '__main__':
     exec_test(test)
-- 
1.5.6.5