[telepathy-salut/master] break a race in stream tube tests

[Guillaume Desmottes]

---
 .../avahi/tubes/test-two-muc-stream-tubes.py       |   12 +++++-------
 .../avahi/tubes/test-two-private-stream-tubes.py   |   18 +++++++++---------
 2 files changed, 14 insertions(+), 16 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 2c121a6..1ad7e56 100644
--- a/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py
+++ b/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py
@@ -451,19 +451,17 @@ def test(q, bus, conn):
     client.connectUNIX(unix_socket_adr).addCallback(client_connected_cb)
 
     # server got the connection
-    _, e = q.expect_many(
+    _, client_connected, remote_sig, local_sig, data_received = q.expect_many(
         EventPattern('server-connected'),
-        EventPattern('client-connected'))
-
-    client_transport = e.transport
-
-    remote_sig, local_sig, e = q.expect_many(
+        EventPattern('client-connected'),
         EventPattern('dbus-signal', signal='NewRemoteConnection',
             path=tube1_path),
         EventPattern('dbus-signal', signal='NewLocalConnection',
             path=tube2_path),
         EventPattern('client-data-received'))
 
+    client_transport = client_connected.transport
+
     handle, conn_param, contact1_tube_conn_id = remote_sig.args
     assert handle == contact2_handle_on_conn1
     assert contact1_tube_conn_id != 0
@@ -472,7 +470,7 @@ def test(q, bus, conn):
     assert contact2_tube_conn_id != 0
 
     # client receives server's welcome message
-    assert e.data == SERVER_WELCOME_MSG
+    assert data_received.data == SERVER_WELCOME_MSG
 
     client_transport.write(test_string)
 
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 a9b28aa..d9c2aa4 100644
--- a/tests/twisted/avahi/tubes/test-two-private-stream-tubes.py
+++ b/tests/twisted/avahi/tubes/test-two-private-stream-tubes.py
@@ -328,17 +328,17 @@ def test(q, bus, conn):
     client.connectUNIX(unix_socket_adr).addCallback(client_connected_cb)
 
     # server got the connection
-    _, e = q.expect_many(
+    _, client_connected, remote_sig, local_sig, data_received = q.expect_many(
         EventPattern('server-connected'),
-        EventPattern('client-connected'))
-
-    client_transport = e.transport
-
-    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-connected'),
+        EventPattern('dbus-signal', signal='NewRemoteConnection',
+            path=tube1_path),
+        EventPattern('dbus-signal', signal='NewLocalConnection',
+            path=tube2_path),
         EventPattern('client-data-received'))
 
+    client_transport = client_connected.transport
+
     handle, conn_param, contact1_tube_conn_id = remote_sig.args
     assert handle == contact2_handle_on_conn1
     assert contact1_tube_conn_id != 0
@@ -347,7 +347,7 @@ def test(q, bus, conn):
     assert contact2_tube_conn_id != 0
 
     # client receives server's welcome message
-    assert e.data == SERVER_WELCOME_MSG
+    assert data_received.data == SERVER_WELCOME_MSG
 
     client_transport.write(test_string)
 
-- 
1.5.6.5