[Telepathy-commits] [telepathy-salut/master] test-two-private-stream-tubes: check if we receive welcome msg from the server

[Guillaume Desmottes]

---
 .../twisted/avahi/test-two-private-stream-tubes.py |   28 +++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/tests/twisted/avahi/test-two-private-stream-tubes.py b/tests/twisted/avahi/test-two-private-stream-tubes.py
index 44c6d8a..18b7e75 100644
--- a/tests/twisted/avahi/test-two-private-stream-tubes.py
+++ b/tests/twisted/avahi/test-two-private-stream-tubes.py
@@ -24,6 +24,8 @@ sample_parameters = dbus.Dictionary({
 
 test_string = "This string travels on a tube !"
 
+SERVER_WELCOME_MSG = "Welcome!"
+
 def test(q, bus, conn):
 
     # define a basic tcp server that echoes what the client says, but with
@@ -34,11 +36,19 @@ def test(q, bus, conn):
             e = Event('server-data-received', service = self, data = data)
             q.append(e)
 
+        def connectionMade(self):
+            e = Event('server-connected', transport = self.transport)
+            q.append(e)
+
+            # send welcome message to the client
+            self.transport.write(SERVER_WELCOME_MSG)
+
     # define a basic tcp client
     class ClientGreeter(Protocol):
         def dataReceived(self, data):
             e = Event('client-data-received', service = self, data = data)
             q.append(e)
+
     def client_connected_cb(p):
         e = Event('client-connected', transport = p.transport)
         q.append(e)
@@ -151,8 +161,24 @@ def test(q, bus, conn):
     client = ClientCreator(reactor, ClientGreeter)
     client.connectUNIX(unix_socket_adr).addCallback(client_connected_cb)
 
-    e = q.expect('client-connected')
+    # server got the connection
+    _, e = q.expect_many(
+        EventPattern('server-connected'),
+        EventPattern('client-connected'))
+
     client_transport = e.transport
+
+    new_conn_event, data_event = q.expect_many(
+        EventPattern('dbus-signal', signal='StreamTubeNewConnection', path=contact1_tubes_channel_path),
+        EventPattern('client-data-received'))
+
+    id, handle = new_conn_event.args
+    assert id == tube_id
+    assert handle == contact2_handle_on_conn1
+
+    # client receives server's welcome message
+    assert data_event.data == SERVER_WELCOME_MSG
+
     client_transport.write(test_string)
 
     e = q.expect('server-data-received')
-- 
1.5.6.5