[telepathy-salut/master] check if NewLocalConnection is properly fired

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Fri Jun 26 07:16:30 PDT 2009


---
 .../avahi/tubes/test-two-muc-stream-tubes.py       |   11 ++++++++---
 .../avahi/tubes/test-two-private-stream-tubes.py   |   10 +++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py b/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py
index 76c58f1..2c121a6 100644
--- a/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py
+++ b/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py
@@ -457,14 +457,19 @@ def test(q, bus, conn):
 
     client_transport = e.transport
 
-    sig, e = q.expect_many(
+    remote_sig, local_sig, e = q.expect_many(
         EventPattern('dbus-signal', signal='NewRemoteConnection',
             path=tube1_path),
+        EventPattern('dbus-signal', signal='NewLocalConnection',
+            path=tube2_path),
         EventPattern('client-data-received'))
 
-    handle, conn_param, conn_id = sig.args
+    handle, conn_param, contact1_tube_conn_id = remote_sig.args
     assert handle == contact2_handle_on_conn1
-    assert conn_id != 0
+    assert contact1_tube_conn_id != 0
+
+    contact2_tube_conn_id = local_sig.args[0]
+    assert contact2_tube_conn_id != 0
 
     # client receives server's welcome message
     assert e.data == SERVER_WELCOME_MSG
diff --git a/tests/twisted/avahi/tubes/test-two-private-stream-tubes.py b/tests/twisted/avahi/tubes/test-two-private-stream-tubes.py
index 660141c..a9b28aa 100644
--- a/tests/twisted/avahi/tubes/test-two-private-stream-tubes.py
+++ b/tests/twisted/avahi/tubes/test-two-private-stream-tubes.py
@@ -334,13 +334,17 @@ def test(q, bus, conn):
 
     client_transport = e.transport
 
-    sig, e = q.expect_many(
+    remote_sig, local_sig, e = q.expect_many(
         EventPattern('dbus-signal', signal='NewRemoteConnection', path=tube1_path),
+        EventPattern('dbus-signal', signal='NewLocalConnection', path=tube2_path),
         EventPattern('client-data-received'))
 
-    handle, conn_param, conn_id = sig.args
+    handle, conn_param, contact1_tube_conn_id = remote_sig.args
     assert handle == contact2_handle_on_conn1
-    assert conn_id != 0
+    assert contact1_tube_conn_id != 0
+
+    contact2_tube_conn_id = local_sig.args[0]
+    assert contact2_tube_conn_id != 0
 
     # client receives server's welcome message
     assert e.data == SERVER_WELCOME_MSG
-- 
1.5.6.5




More information about the telepathy-commits mailing list