diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-04-01 17:59:55 +0100 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-04-01 18:52:00 +0100 |
commit | 2e03ee2ad64327a5427e3e299e9fc77fe45b4c40 (patch) | |
tree | d95efd98345de4883ccfcf5b08d3b29b6e859b40 | |
parent | 3ea677c10ce94e3b01e8d4f558a9d6d4620afa4d (diff) | |
download | telepathy-salut-2e03ee2ad64327a5427e3e299e9fc77fe45b4c40.tar.gz |
disable 1-1 stream tubes
-rw-r--r-- | src/salut-connection.c | 4 | ||||
-rw-r--r-- | tests/twisted/avahi/test-caps-tubes.py | 4 | ||||
-rw-r--r-- | tests/twisted/avahi/test-offer-private-stream-tube.py | 4 | ||||
-rw-r--r-- | tests/twisted/avahi/test-tube-close.py | 7 | ||||
-rw-r--r-- | tests/twisted/avahi/test-two-private-stream-tubes.py | 4 | ||||
-rw-r--r-- | tests/twisted/avahi/tubes-to-nonexistant-ids.py | 4 |
6 files changed, 24 insertions, 3 deletions
diff --git a/src/salut-connection.c b/src/salut-connection.c index cccaacca..6ff27a25 100644 --- a/src/salut-connection.c +++ b/src/salut-connection.c @@ -3213,15 +3213,19 @@ salut_connection_create_channel_managers (TpBaseConnection *base) priv->roomlist_manager = salut_discovery_client_create_roomlist_manager ( priv->discovery_client, self, priv->xmpp_connection_manager); +#if 0 priv->tubes_manager = salut_tubes_manager_new (self, priv->contact_manager, priv->xmpp_connection_manager); +#endif g_ptr_array_add (managers, priv->im_manager); g_ptr_array_add (managers, priv->contact_manager); g_ptr_array_add (managers, priv->ft_manager); g_ptr_array_add (managers, priv->muc_manager); g_ptr_array_add (managers, priv->roomlist_manager); +#if 0 g_ptr_array_add (managers, priv->tubes_manager); +#endif return managers; } diff --git a/tests/twisted/avahi/test-caps-tubes.py b/tests/twisted/avahi/test-caps-tubes.py index 6529455f..c52a8525 100644 --- a/tests/twisted/avahi/test-caps-tubes.py +++ b/tests/twisted/avahi/test-caps-tubes.py @@ -49,6 +49,10 @@ from constants import * from caps_helper import compute_caps_hash, check_caps from config import PACKAGE_STRING +print "FIXME: test-caps-tubes.py disabled because 1-1 tubes are disabled for now" +# exiting 77 causes automake to consider the test to have been skipped +raise SystemExit(77) + text_fixed_properties = dbus.Dictionary({ 'org.freedesktop.Telepathy.Channel.TargetHandleType': 1L, 'org.freedesktop.Telepathy.Channel.ChannelType': diff --git a/tests/twisted/avahi/test-offer-private-stream-tube.py b/tests/twisted/avahi/test-offer-private-stream-tube.py index fd531b6d..20f72f1e 100644 --- a/tests/twisted/avahi/test-offer-private-stream-tube.py +++ b/tests/twisted/avahi/test-offer-private-stream-tube.py @@ -37,6 +37,10 @@ sample_parameters = dbus.Dictionary({ test_string = "This string travels on a tube !" +print "FIXME: test-offer-private-stream-tube.py disabled because 1-1 tubes are disabled for now" +# exiting 77 causes automake to consider the test to have been skipped +raise SystemExit(77) + def check_conn_properties(q, bus, conn, channel_list=None): properties = conn.GetAll( 'org.freedesktop.Telepathy.Connection.Interface.Requests', diff --git a/tests/twisted/avahi/test-tube-close.py b/tests/twisted/avahi/test-tube-close.py index fe5bda7c..9c190bd8 100644 --- a/tests/twisted/avahi/test-tube-close.py +++ b/tests/twisted/avahi/test-tube-close.py @@ -23,9 +23,10 @@ HT_CONTACT_LIST = 3 SOCKET_ADDRESS_TYPE_IPV4 = dbus.UInt32(2) SOCKET_ACCESS_CONTROL_LOCALHOST = dbus.UInt32(0) -print "FIXME: test-tube-close.py disabled because sending a close stanza on " -print "disconnection is not yet implemented in telepathy-salut. It requires " -print "to ensure the XmppConnection and reestablish it" +#print "FIXME: test-tube-close.py disabled because sending a close stanza on " +#print "disconnection is not yet implemented in telepathy-salut. It requires " +#print "to ensure the XmppConnection and reestablish it" +print "FIXME: test-tube-close.py disabled because 1-1 tubes are disabled for now" # exiting 77 causes automake to consider the test to have been skipped raise SystemExit(77) diff --git a/tests/twisted/avahi/test-two-private-stream-tubes.py b/tests/twisted/avahi/test-two-private-stream-tubes.py index adca3ff8..94cbe055 100644 --- a/tests/twisted/avahi/test-two-private-stream-tubes.py +++ b/tests/twisted/avahi/test-two-private-stream-tubes.py @@ -26,6 +26,10 @@ test_string = "This string travels on a tube !" SERVER_WELCOME_MSG = "Welcome!" +print "FIXME: test-two-private-stream-tubes.py disabled because 1-1 tubes are disabled for now" +# exiting 77 causes automake to consider the test to have been skipped +raise SystemExit(77) + def test(q, bus, conn): # define a basic tcp server that echoes what the client says, but with diff --git a/tests/twisted/avahi/tubes-to-nonexistant-ids.py b/tests/twisted/avahi/tubes-to-nonexistant-ids.py index 409c02cf..b4da97f3 100644 --- a/tests/twisted/avahi/tubes-to-nonexistant-ids.py +++ b/tests/twisted/avahi/tubes-to-nonexistant-ids.py @@ -16,6 +16,10 @@ import dbus arbitrary_ids = [ "DooN4Bei@TheeK6bo-Tegh4aci", "ahrui1iM@Dai6igho-ADetaes3" ] +print "FIXME: test-to-nonexistant-ids.py disabled because 1-1 tubes are disabled for now" +# exiting 77 causes automake to consider the test to have been skipped +raise SystemExit(77) + def test(q, bus, conn): conn.Connect() q.expect('dbus-signal', signal='StatusChanged', args=[0L, 0L]) |