diff options
Diffstat (limited to 'tests/twisted/avahi/tubes')
-rw-r--r-- | tests/twisted/avahi/tubes/request-muc-tubes.py | 6 | ||||
-rw-r--r-- | tests/twisted/avahi/tubes/tubetestutil.py | 10 | ||||
-rw-r--r-- | tests/twisted/avahi/tubes/two-muc-dbus-tubes.py | 4 |
3 files changed, 5 insertions, 15 deletions
diff --git a/tests/twisted/avahi/tubes/request-muc-tubes.py b/tests/twisted/avahi/tubes/request-muc-tubes.py index 21100f15..206f3384 100644 --- a/tests/twisted/avahi/tubes/request-muc-tubes.py +++ b/tests/twisted/avahi/tubes/request-muc-tubes.py @@ -8,7 +8,7 @@ import avahitest from twisted.words.xish import domish -from saluttest import exec_test, wait_for_contact_list +from saluttest import exec_test from servicetest import call_async, EventPattern, wrap_channel, pretty import constants as cs @@ -19,10 +19,6 @@ def test(q, bus, conn): q.expect('dbus-signal', signal='StatusChanged', args=[0L, 0L]) - # FIXME: this is a hack to be sure to have all the contact list channels - # announced so they won't interfere with the muc ones announces. - wait_for_contact_list(q, conn) - # check if we can request tube channels properties = conn.Properties.GetAll(cs.CONN_IFACE_REQUESTS) assert ({cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_STREAM_TUBE, diff --git a/tests/twisted/avahi/tubes/tubetestutil.py b/tests/twisted/avahi/tubes/tubetestutil.py index d058ef62..4e342f9e 100644 --- a/tests/twisted/avahi/tubes/tubetestutil.py +++ b/tests/twisted/avahi/tubes/tubetestutil.py @@ -1,4 +1,4 @@ -from saluttest import make_connection, wait_for_contact_list +from saluttest import make_connection from avahitest import get_host_name from servicetest import make_channel_proxy @@ -10,10 +10,6 @@ def connect_two_accounts(q, bus, conn): 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', @@ -25,8 +21,6 @@ def connect_two_accounts(q, bus, conn): 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, @@ -62,7 +56,7 @@ def connect_two_accounts(q, bus, conn): # property first contact1_handle_on_conn2 = 0 conn2_members = conn2_publish_proxy.Get( - 'org.freedesktop.Telepathy.Channel.Interface.Group', 'Members', + 'im.telepathy1.Channel.Interface.Group', 'Members', dbus_interface='org.freedesktop.DBus.Properties') for h in conn2_members: name = conn2.InspectHandles(cs.HT_CONTACT, [h])[0] diff --git a/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py b/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py index 6fc81097..ae8864c3 100644 --- a/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py +++ b/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py @@ -21,9 +21,9 @@ def check_dbus_names(tube, members): names = tube.Properties.Get(cs.CHANNEL_TYPE_DBUS_TUBE, 'DBusNames') assert set(names.keys()) == set(members), names.keys() -SERVICE = "org.freedesktop.Telepathy.Tube.Test" +SERVICE = "im.telepathy1.Tube.Test" IFACE = SERVICE -PATH = "/org/freedesktop/Telepathy/Tube/Test" +PATH = "/im/telepathy1/Tube/Test" print "FIXME: MUC tubes tests are currently broken: fdo#69223" # exiting 77 causes automake to consider the test to have been skipped |