[Telepathy-commits] [telepathy-gabble/master] tests/twisted/roster/ensure.py: expect that EnsureChannel returns before NewChannels is emitted

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Nov 3 09:56:28 PST 2008


Spec 0.17.14 compliance in telepathy-glib 0.7.18
---
 tests/twisted/roster/ensure.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/twisted/roster/ensure.py b/tests/twisted/roster/ensure.py
index db9f700..fa1b507 100644
--- a/tests/twisted/roster/ensure.py
+++ b/tests/twisted/roster/ensure.py
@@ -40,6 +40,9 @@ def test(q, bus, conn, stream):
               'org.freedesktop.Telepathy.Channel.TargetHandle': test_handle,
               })
 
+    ret = q.expect('dbus-return', method='EnsureChannel')
+    ret2 = q.expect('dbus-return', method='EnsureChannel')
+
     while True:
         sig = q.expect('dbus-signal', signal='NewChannels')
         sig_path, sig_props = sig.args[0][0]
@@ -48,8 +51,6 @@ def test(q, bus, conn, stream):
            sig_props['org.freedesktop.Telepathy.Channel.TargetHandle'] ==\
             test_handle:
             break
-    ret = q.expect('dbus-return', method='EnsureChannel')
-    ret2 = q.expect('dbus-return', method='EnsureChannel')
 
     yours, path, props = ret.value
     yours2, path2, props2 = ret2.value
-- 
1.5.6.5




More information about the Telepathy-commits mailing list