[Telepathy-commits] [telepathy-salut/master] test-two-muc-stream-tubes.py: create an event when the server got a connection and send a welcome message to the client

[Guillaume Desmottes]

---
 tests/twisted/avahi/test-two-muc-stream-tubes.py |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/tests/twisted/avahi/test-two-muc-stream-tubes.py b/tests/twisted/avahi/test-two-muc-stream-tubes.py
index 1ba712a..a63b7ab 100644
--- a/tests/twisted/avahi/test-two-muc-stream-tubes.py
+++ b/tests/twisted/avahi/test-two-muc-stream-tubes.py
@@ -39,6 +39,8 @@ test_string = "This string travels on a tube !"
 
 muc_name = "test-two-muc-stream-tubes"
 
+SERVER_WELCOME_MSG = "Welcome!"
+
 def test(q, bus, conn):
 
     # define a basic tcp server that echoes what the client says, but with
@@ -49,11 +51,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)
@@ -241,6 +251,9 @@ def test(q, bus, conn):
     client = ClientCreator(reactor, ClientGreeter)
     client.connectUNIX(unix_socket_adr).addCallback(client_connected_cb)
 
+    # server got the connection
+    q.expect('server-connected')
+
     e = q.expect('client-connected')
     client_transport = e.transport
 
@@ -249,6 +262,10 @@ def test(q, bus, conn):
     assert id == conn1_tube_id
     assert handle == contact2_handle_on_conn1
 
+    # client receives server's welcome message
+    e = q.expect('client-data-received')
+    assert e.data == SERVER_WELCOME_MSG
+
     client_transport.write(test_string)
 
     e = q.expect('server-data-received')
-- 
1.5.6.5