[Telepathy-commits] [telepathy-salut/master] Start of the olpc activity announcements

[Sjoerd Simons]

---
 tests/twisted/Makefile.am                          |    3 +-
 .../avahi/test-olpc-activity-announcements.py      |   82 ++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletions(-)
 create mode 100644 tests/twisted/avahi/test-olpc-activity-announcements.py

diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index a3549dd..1f099a0 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -5,7 +5,8 @@ TWISTED_BASIC_TESTS =
 TWISTED_AVAHI_TESTS = \
 	avahi/test-register.py \
 	avahi/test-aliases.py \
-	avahi/test-text-channel.py
+	avahi/test-text-channel.py \
+	avahi/test-olpc-activity-announcements.py
 
 TESTS =
 
diff --git a/tests/twisted/avahi/test-olpc-activity-announcements.py b/tests/twisted/avahi/test-olpc-activity-announcements.py
new file mode 100644
index 0000000..37022ae
--- /dev/null
+++ b/tests/twisted/avahi/test-olpc-activity-announcements.py
@@ -0,0 +1,82 @@
+from saluttest import exec_test
+from avahitest import AvahiAnnouncer, AvahiListener
+from avahitest import get_host_name
+import avahi
+
+from xmppstream import setup_stream_listener, connect_to_stream
+from servicetest import make_channel_proxy, format_event
+
+from twisted.words.xish import xpath, domish
+
+
+import time
+import dbus
+
+CHANNEL_TYPE_TEXT = "org.freedesktop.Telepathy.Channel.Type.Text"
+HT_CONTACT = 1
+HT_ROOM = 2
+HT_CONTACT_LIST = 3
+
+PUBLISHED_NAME = "acttest"
+TESTSUITE_PUBLISHED_NAME = "salutacttest"
+ACTIVITY_ID = str(time.time())
+
+def get_handle(name, q, conn):
+    publish_handle = conn.RequestHandles(HT_CONTACT_LIST, ["publish"])[0]
+    publish = conn.RequestChannel(
+        "org.freedesktop.Telepathy.Channel.Type.ContactList",
+        HT_CONTACT_LIST, publish_handle, False)
+
+    handle = 0
+    # Wait until the record shows up in publish
+    while handle == 0:
+        e = q.expect('dbus-signal', signal='MembersChanged', path=publish)
+        for h in e.args[1]:
+            handle_name = conn.InspectHandles(HT_CONTACT, [h])[0]
+
+            if name == handle_name:
+                handle = h
+
+    return handle
+
+def activity_listener_hook(q, event):
+    # Assert that the testsuite doesn't announce the activity
+    assert event.name != \
+      ACTIVITY_ID + ":" + TESTSUITE_PUBLISHED_NAME + "@" + get_host_name(), \
+        "salut announced the activity while it shouldn't"
+
+def test(q, bus, conn):
+    conn.Connect()
+    q.expect('dbus-signal', signal='StatusChanged', args=[0L, 0L])
+
+
+    activity_txt = { "type": "org.laptop.HelloMesh",
+            "name": "HelloMesh",
+            "color": "#7b83c1,#260993",
+            "txtvers": "0",
+            "activity-id": ACTIVITY_ID,
+            "room": ACTIVITY_ID
+          }
+
+
+    # Listen for announcements
+    l = AvahiListener(q).listen_for_service("_olpc-activity1._udp")
+    q.hook(activity_listener_hook, 'service-added')
+
+    contact_name = PUBLISHED_NAME + "@" + get_host_name()
+
+    activity_name = ACTIVITY_ID + ":" + PUBLISHED_NAME + "@" + get_host_name()
+
+    AvahiAnnouncer(contact_name, "_presence._tcp", 1234, {})
+    AvahiAnnouncer(ACTIVITY_ID, "_clique._udp", 12345, {})
+    AvahiAnnouncer(activity_name, "_olpc-activity1._udp",
+      0, activity_txt)
+
+    # Publish a contact, now get it's handle
+    handle = get_handle (contact_name, q, conn)
+
+    while True:
+      e = q.expect('dbus-signal', signal = 'ActivitiesChanged')
+
+if __name__ == '__main__':
+    exec_test(test, { "published-name": TESTSUITE_PUBLISHED_NAME} )
-- 
1.5.6.5