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

[Guillaume Desmottes]

---
 .../avahi/tubes/test-two-muc-stream-tubes.py       |   12 +++++++++++-
 .../avahi/tubes/test-two-private-stream-tubes.py   |   12 +++++++++++-
 2 files changed, 22 insertions(+), 2 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 1ad7e56..19e729c 100644
--- a/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py
+++ b/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py
@@ -482,12 +482,22 @@ def test(q, bus, conn):
     assert client_received.data == string.swapcase(test_string)
 
     call_async(q, contact1_tube_channel, 'Close')
-    q.expect_many(
+    _, e1, e2, _, _, _ = q.expect_many(
         EventPattern('dbus-return', method='Close'),
+        EventPattern('dbus-signal', signal='ConnectionClosed', path=tube1_path),
+        EventPattern('dbus-signal', signal='ConnectionClosed', path=tube2_path),
         EventPattern('dbus-signal', signal='Closed'),
         EventPattern('dbus-signal', signal='TubeClosed'),
         EventPattern('dbus-signal', signal='ChannelClosed'))
 
+    conn_id, error, dbus_msg = e1.args
+    assert conn_id == contact1_tube_conn_id
+    assert error == CANCELLED
+
+    conn_id, error, dbus_msg = e2.args
+    assert conn_id == contact2_tube_conn_id
+    assert error == CONNECTION_LOST
+
     call_async(q, contact2_tube_channel, 'Close')
     q.expect_many(
         EventPattern('dbus-return', method='Close'),
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 d9c2aa4..72f0763 100644
--- a/tests/twisted/avahi/tubes/test-two-private-stream-tubes.py
+++ b/tests/twisted/avahi/tubes/test-two-private-stream-tubes.py
@@ -362,13 +362,23 @@ def test(q, bus, conn):
     call_async(q, contact1_tube_channel, 'Close')
 
     # tube is closed on both sides
-    q.expect_many(
+    _, e1, e2, _, _, _, _ = q.expect_many(
         EventPattern('dbus-return', method='Close'),
+        EventPattern('dbus-signal', signal='ConnectionClosed', path=tube1_path),
+        EventPattern('dbus-signal', signal='ConnectionClosed', path=tube2_path),
         EventPattern('dbus-signal', signal='Closed', path=tube1_path),
         EventPattern('dbus-signal', signal='Closed', path=tube2_path),
         EventPattern('dbus-signal', signal='ChannelClosed', path=conn.object.object_path),
         EventPattern('dbus-signal', signal='ChannelClosed', path=conn2.object.object_path))
 
+    conn_id, error, dbus_msg = e1.args
+    assert conn_id == contact1_tube_conn_id
+    assert error == CANCELLED
+
+    conn_id, error, dbus_msg = e2.args
+    assert conn_id == contact2_tube_conn_id
+    assert error == CANCELLED
+
     conn.Disconnect()
     q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
     conn2.Disconnect()
-- 
1.5.6.5