[telepathy-salut/master] factor out join_muc() to tubetestutil.py

[Guillaume Desmottes]

---
 .../avahi/tubes/test-two-muc-stream-tubes.py       |   13 +++----------
 tests/twisted/avahi/tubes/tubetestutil.py          |   15 +++++++++++++++
 2 files changed, 18 insertions(+), 10 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 3553d80..1ad8337 100644
--- a/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py
+++ b/tests/twisted/avahi/tubes/test-two-muc-stream-tubes.py
@@ -71,17 +71,10 @@ def test(q, bus, conn):
     contact1_name, conn2, contact2_name, contact2_handle_on_conn1,\
         contact1_handle_on_conn2 = t.connect_two_accounts(q, bus, conn)
 
-    # first connection: join muc
     conn1_self_handle = conn.GetSelfHandle()
-    muc_handle1 = conn.RequestHandles(HT_ROOM, [muc_name])[0]
-    path = conn.RequestChannel(CHANNEL_TYPE_TEXT, HT_ROOM, muc_handle1, True)
-    # added as remote pending
-    q.expect('dbus-signal', signal='MembersChanged', path=path,
-        args=['', [], [], [], [conn1_self_handle], conn1_self_handle, 0])
-    # added as member
-    q.expect('dbus-signal', signal='MembersChanged', path=path,
-        args=['', [conn1_self_handle], [], [], [], conn1_self_handle, 0])
-    group1 = make_channel_proxy(conn, path, "Channel.Interface.Group")
+
+    # first connection: join muc
+    muc_handle1, group1 = t.join_muc(q, conn, muc_name)
 
     # first connection: invite contact2
     group1.AddMembers([contact2_handle_on_conn1], "Let's tube!")
diff --git a/tests/twisted/avahi/tubes/tubetestutil.py b/tests/twisted/avahi/tubes/tubetestutil.py
index ae2a1e1..077bb0b 100644
--- a/tests/twisted/avahi/tubes/tubetestutil.py
+++ b/tests/twisted/avahi/tubes/tubetestutil.py
@@ -1,5 +1,6 @@
 from saluttest import make_connection, wait_for_contact_list
 from avahitest import get_host_name
+from servicetest import make_channel_proxy
 
 import constants as cs
 
@@ -76,3 +77,17 @@ def connect_two_accounts(q, bus, conn):
                 contact1_handle_on_conn2 = h
 
     return contact1_name, conn2, contact2_name, contact2_handle_on_conn1, contact1_handle_on_conn2
+
+def join_muc(q, conn, muc_name):
+    self_handle = conn.GetSelfHandle()
+    muc_handle = conn.RequestHandles(cs.HT_ROOM, [muc_name])[0]
+    path = conn.RequestChannel(cs.CHANNEL_TYPE_TEXT, cs.HT_ROOM, muc_handle, True)
+    # added as remote pending
+    q.expect('dbus-signal', signal='MembersChanged', path=path,
+        args=['', [], [], [], [self_handle], self_handle, 0])
+    # added as member
+    q.expect('dbus-signal', signal='MembersChanged', path=path,
+        args=['', [self_handle], [], [], [], self_handle, 0])
+    group = make_channel_proxy(conn, path, "Channel.Interface.Group")
+
+    return muc_handle, group
-- 
1.5.6.5