[telepathy-salut/master] add tubetestutil.py containing connect_two_accounts(), a tube tests helper function

[Guillaume Desmottes]

---
 tests/twisted/Makefile.am                 |    3 +-
 tests/twisted/avahi/tubes/tubetestutil.py |   78 +++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 1 deletions(-)
 create mode 100644 tests/twisted/avahi/tubes/tubetestutil.py

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 5a709a0..2f7d41a 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -98,7 +98,8 @@ EXTRA_DIST = \
         trivialstream.py \
         config.py \
 	ns.py \
-	avahi/file-transfer/file_transfer_helper.py
+	avahi/file-transfer/file_transfer_helper.py \
+	avahi/tubes/tubetestutil.py
 
 CLEANFILES = salut-[1-9]*.log *.pyc */*.pyc config.py
 
diff --git a/tests/twisted/avahi/tubes/tubetestutil.py b/tests/twisted/avahi/tubes/tubetestutil.py
new file mode 100644
index 0000000..ae2a1e1
--- /dev/null
+++ b/tests/twisted/avahi/tubes/tubetestutil.py
@@ -0,0 +1,78 @@
+from saluttest import make_connection, wait_for_contact_list
+from avahitest import get_host_name
+
+import constants as cs
+
+def connect_two_accounts(q, bus, conn):
+    # first connection: connect
+    contact1_name = "testsuite" + "@" + get_host_name()
+    conn.Connect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[cs.CONN_STATUS_CONNECTED, cs.CSR_NONE_SPECIFIED])
+
+    # FIXME: this is a hack to be sure to have all the contact list channels
+    # announced so they won't interfere with other channels announces.
+    wait_for_contact_list(q, conn)
+
+    # second connection: connect
+    conn2_params = {
+        'published-name': 'testsuite2',
+        'first-name': 'test2',
+        'last-name': 'suite2',
+        }
+    contact2_name = "testsuite2" + "@" + get_host_name()
+    conn2 = make_connection(bus, lambda x: None, conn2_params)
+    conn2.Connect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[cs.CONN_STATUS_CONNECTED, cs.CSR_NONE_SPECIFIED])
+
+    wait_for_contact_list(q, conn2)
+
+    # first connection: get the contact list
+    publish_handle = conn.RequestHandles(cs.HT_LIST, ["publish"])[0]
+    conn1_publish = conn.RequestChannel(cs.CHANNEL_TYPE_CONTACT_LIST,
+        cs.HT_LIST, publish_handle, False)
+    conn1_publish_proxy = bus.get_object(conn.bus_name, conn1_publish)
+
+    # second connection: get the contact list
+    publish_handle = conn2.RequestHandles(cs.HT_LIST, ["publish"])[0]
+    conn2_publish = conn2.RequestChannel(cs.CHANNEL_TYPE_CONTACT_LIST,
+        cs.HT_LIST, publish_handle, False)
+    conn2_publish_proxy = bus.get_object(conn2.bus_name, conn2_publish)
+
+    # first connection: wait to see contact2
+    # The signal MembersChanged may be already emitted... check the Members
+    # property first
+    contact2_handle_on_conn1 = 0
+    conn1_members = conn1_publish_proxy.Get(cs.CHANNEL_IFACE_GROUP, 'Members',
+            dbus_interface=cs.PROPERTIES_IFACE)
+    for h in conn1_members:
+        name = conn.InspectHandles(cs.HT_CONTACT, [h])[0]
+        if name == contact2_name:
+            contact2_handle_on_conn1 = h
+    while contact2_handle_on_conn1 == 0:
+        e = q.expect('dbus-signal', signal='MembersChanged',
+            path=conn1_publish)
+        for h in e.args[1]:
+            name = conn.InspectHandles(cs.HT_CONTACT, [h])[0]
+            if name == contact2_name:
+                contact2_handle_on_conn1 = h
+
+    # second connection: wait to see contact1
+    # The signal MembersChanged may be already emitted... check the Members
+    # property first
+    contact1_handle_on_conn2 = 0
+    conn2_members = conn2_publish_proxy.Get(
+            'org.freedesktop.Telepathy.Channel.Interface.Group', 'Members',
+            dbus_interface='org.freedesktop.DBus.Properties')
+    for h in conn2_members:
+        name = conn2.InspectHandles(cs.HT_CONTACT, [h])[0]
+        if name == contact1_name:
+            contact1_handle_on_conn2 = h
+    while contact1_handle_on_conn2 == 0:
+        e = q.expect('dbus-signal', signal='MembersChanged',
+            path=conn2_publish)
+        for h in e.args[1]:
+            name = conn2.InspectHandles(cs.HT_CONTACT, [h])[0]
+            if name == contact1_name:
+                contact1_handle_on_conn2 = h
+
+    return contact1_name, conn2, contact2_name, contact2_handle_on_conn1, contact1_handle_on_conn2
-- 
1.5.6.5