[Telepathy-commits] [telepathy-gabble/master] Don't import * from tubetestutil
Will Thompson
will.thompson at collabora.co.uk
Tue Feb 3 11:42:29 PST 2009
Instead, import it as t.
---
tests/twisted/tubes/accept-muc-stream-tube-ibb.py | 4 ++--
tests/twisted/tubes/close-muc-with-closed-tube.py | 4 ++--
.../twisted/tubes/create-invalid-tube-channels.py | 1 -
.../offer-accept-private-dbus-stream-tube-ibb.py | 16 ++++++++--------
...offer-accept-private-dbus-stream-tube-socks5.py | 8 ++++----
tests/twisted/tubes/offer-muc-dbus-tube.py | 4 ++--
tests/twisted/tubes/offer-muc-stream-tube-ibb.py | 4 ++--
tests/twisted/tubes/offer-private-dbus-tube-ibb.py | 6 +++---
8 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/tests/twisted/tubes/accept-muc-stream-tube-ibb.py b/tests/twisted/tubes/accept-muc-stream-tube-ibb.py
index f98b62d..b79ccac 100644
--- a/tests/twisted/tubes/accept-muc-stream-tube-ibb.py
+++ b/tests/twisted/tubes/accept-muc-stream-tube-ibb.py
@@ -6,7 +6,7 @@ import dbus
from servicetest import call_async, EventPattern, EventProtocolClientFactory
from gabbletest import exec_test, make_result_iq, acknowledge_iq
from constants import *
-from tubetestutil import *
+import tubetestutil as t
from twisted.words.xish import domish, xpath
from twisted.internet import reactor
@@ -173,7 +173,7 @@ def test(q, bus, conn, stream):
)]
assert len(tubes) == 1, unwrap(tubes)
- check_tube_in_tubes(expected_tube, tubes)
+ t.check_tube_in_tubes(expected_tube, tubes)
# tube channel is also announced (new API)
new_event = q.expect('dbus-signal', signal='NewChannels')
diff --git a/tests/twisted/tubes/close-muc-with-closed-tube.py b/tests/twisted/tubes/close-muc-with-closed-tube.py
index ee09641..83f063c 100644
--- a/tests/twisted/tubes/close-muc-with-closed-tube.py
+++ b/tests/twisted/tubes/close-muc-with-closed-tube.py
@@ -6,7 +6,7 @@ import dbus
from servicetest import call_async, EventPattern, tp_name_prefix, EventProtocolClientFactory
from gabbletest import exec_test, make_result_iq, acknowledge_iq
from constants import *
-from tubetestutil import *
+import tubetestutil as t
from twisted.words.xish import domish, xpath
from twisted.internet import reactor
@@ -158,7 +158,7 @@ def test(q, bus, conn, stream):
TUBE_STATE_LOCAL_PENDING)
tubes = tubes_iface.ListTubes(byte_arrays=True)
assert len(tubes) == 1, unwrap(tubes)
- check_tube_in_tubes(expected_tube, tubes)
+ t.check_tube_in_tubes(expected_tube, tubes)
# reject the tube
tubes_iface.CloseTube(tube_id)
diff --git a/tests/twisted/tubes/create-invalid-tube-channels.py b/tests/twisted/tubes/create-invalid-tube-channels.py
index ebb79db..78be002 100644
--- a/tests/twisted/tubes/create-invalid-tube-channels.py
+++ b/tests/twisted/tubes/create-invalid-tube-channels.py
@@ -8,7 +8,6 @@ from dbus import PROPERTIES_IFACE
from servicetest import call_async
from gabbletest import exec_test
from constants import *
-from tubetestutil import *
def is_tube(path, props):
ct = props[CHANNEL_TYPE]
diff --git a/tests/twisted/tubes/offer-accept-private-dbus-stream-tube-ibb.py b/tests/twisted/tubes/offer-accept-private-dbus-stream-tube-ibb.py
index 511a52b..962da0c 100644
--- a/tests/twisted/tubes/offer-accept-private-dbus-stream-tube-ibb.py
+++ b/tests/twisted/tubes/offer-accept-private-dbus-stream-tube-ibb.py
@@ -11,7 +11,7 @@ from dbus.lowlevel import SignalMessage
from servicetest import call_async, EventPattern, watch_tube_signals
from gabbletest import exec_test, acknowledge_iq, sync_stream
from constants import *
-from tubetestutil import *
+import tubetestutil as t
from dbus import PROPERTIES_IFACE
@@ -154,7 +154,7 @@ def test(q, bus, conn, stream):
set_up_echo("")
set_up_echo("2")
- check_conn_properties(q, conn)
+ t.check_conn_properties(q, conn)
conn.Connect()
@@ -265,7 +265,7 @@ def test(q, bus, conn, stream):
bob_handle, 'bob at localhost', conn.GetSelfHandle())
old_tubes_channel_properties = new_sig.args[0][0]
- check_conn_properties(q, conn, [old_tubes_channel_properties])
+ t.check_conn_properties(q, conn, [old_tubes_channel_properties])
# Try to CreateChannel with correct properties
# Gabble must succeed
@@ -316,7 +316,7 @@ def test(q, bus, conn, stream):
assert TUBE_STATE not in stream_tube_channel_properties
assert TUBE_PARAMETERS not in stream_tube_channel_properties
- check_conn_properties(q, conn,
+ t.check_conn_properties(q, conn,
[old_tubes_channel_properties, stream_tube_channel_properties])
tubes_chan = bus.get_object(conn.bus_name, chan_path)
@@ -515,7 +515,7 @@ def test(q, bus, conn, stream):
expected_tube = (stream_tube_id, self_handle, TUBE_TYPE_STREAM, 'echo',
sample_parameters, TUBE_STATE_OPEN)
- check_tube_in_tubes(expected_tube, tubes_iface.ListTubes(byte_arrays=True))
+ t.check_tube_in_tubes(expected_tube, tubes_iface.ListTubes(byte_arrays=True))
# The CM is the server, so fake a client wanting to talk to it
# New API tube
@@ -558,7 +558,7 @@ def test(q, bus, conn, stream):
expected_tube = (new_stream_tube_id, self_handle, TUBE_TYPE_STREAM,
'newecho', new_sample_parameters, TUBE_STATE_OPEN)
- check_tube_in_tubes (expected_tube, tubes_iface.ListTubes(byte_arrays=True))
+ t.check_tube_in_tubes (expected_tube, tubes_iface.ListTubes(byte_arrays=True))
# have the fake client open the stream
# Old tube API
@@ -704,8 +704,8 @@ def test(q, bus, conn, stream):
'com.example.TestCase', sample_parameters, TUBE_STATE_OPEN)
expected_stube = (stream_tube_id, self_handle, TUBE_TYPE_STREAM,
'echo', sample_parameters, TUBE_STATE_OPEN)
- check_tube_in_tubes(expected_dtube, tubes)
- check_tube_in_tubes(expected_stube, tubes)
+ t.check_tube_in_tubes(expected_dtube, tubes)
+ t.check_tube_in_tubes(expected_stube, tubes)
dbus_tube_adr = tubes_iface.GetDBusTubeAddress(dbus_tube_id)
dbus_tube_conn = Connection(dbus_tube_adr)
diff --git a/tests/twisted/tubes/offer-accept-private-dbus-stream-tube-socks5.py b/tests/twisted/tubes/offer-accept-private-dbus-stream-tube-socks5.py
index 0352d10..cf83b7c 100644
--- a/tests/twisted/tubes/offer-accept-private-dbus-stream-tube-socks5.py
+++ b/tests/twisted/tubes/offer-accept-private-dbus-stream-tube-socks5.py
@@ -13,7 +13,7 @@ from servicetest import call_async, EventPattern, tp_name_prefix, \
watch_tube_signals, sync_dbus
from gabbletest import exec_test, acknowledge_iq, sync_stream
from constants import *
-from tubetestutil import *
+import tubetestutil as t
from twisted.words.xish import domish, xpath
from twisted.internet.protocol import Factory, Protocol
@@ -527,7 +527,7 @@ def test(q, bus, conn, stream):
expected_tube = (stream_tube_id, self_handle, TUBE_TYPE_STREAM, 'echo',
sample_parameters, TUBE_STATE_OPEN)
tubes = tubes_iface.ListTubes(byte_arrays=True)
- check_tube_in_tubes(expected_tube, tubes)
+ t.check_tube_in_tubes(expected_tube, tubes)
# The CM is the server, so fake a client wanting to talk to it
# New API tube
@@ -793,8 +793,8 @@ def test(q, bus, conn, stream):
'com.example.TestCase', sample_parameters, TUBE_STATE_OPEN)
expected_stube = (stream_tube_id, self_handle, TUBE_TYPE_STREAM,
'echo', sample_parameters, TUBE_STATE_OPEN)
- check_tube_in_tubes(expected_dtube, tubes)
- check_tube_in_tubes(expected_stube, tubes)
+ t.check_tube_in_tubes(expected_dtube, tubes)
+ t.check_tube_in_tubes(expected_stube, tubes)
dbus_tube_adr = tubes_iface.GetDBusTubeAddress(dbus_tube_id)
dbus_tube_conn = Connection(dbus_tube_adr)
diff --git a/tests/twisted/tubes/offer-muc-dbus-tube.py b/tests/twisted/tubes/offer-muc-dbus-tube.py
index 33b6a3f..e708ca5 100644
--- a/tests/twisted/tubes/offer-muc-dbus-tube.py
+++ b/tests/twisted/tubes/offer-muc-dbus-tube.py
@@ -9,7 +9,7 @@ from dbus.lowlevel import SignalMessage
from servicetest import call_async, EventPattern, tp_name_prefix
from gabbletest import exec_test, make_result_iq, acknowledge_iq
from constants import *
-from tubetestutil import *
+import tubetestutil as t
from twisted.words.xish import domish, xpath
@@ -146,7 +146,7 @@ def test(q, bus, conn, stream):
assert len(tubes) == 1
expected_tube = (dbus_tube_id, tubes_self_handle, TUBE_TYPE_DBUS,
'com.example.TestCase', sample_parameters, TUBE_STATE_OPEN)
- check_tube_in_tubes(expected_tube, tubes)
+ t.check_tube_in_tubes(expected_tube, tubes)
dbus_tube_adr = tubes_iface.GetDBusTubeAddress(dbus_tube_id)
tube = Connection(dbus_tube_adr)
diff --git a/tests/twisted/tubes/offer-muc-stream-tube-ibb.py b/tests/twisted/tubes/offer-muc-stream-tube-ibb.py
index c8b1ab0..7db278c 100644
--- a/tests/twisted/tubes/offer-muc-stream-tube-ibb.py
+++ b/tests/twisted/tubes/offer-muc-stream-tube-ibb.py
@@ -10,7 +10,7 @@ from dbus import PROPERTIES_IFACE
from servicetest import call_async, EventPattern, tp_name_prefix, EventProtocolFactory
from gabbletest import exec_test, make_result_iq, acknowledge_iq, make_muc_presence
from constants import *
-from tubetestutil import *
+import tubetestutil as t
from twisted.words.xish import domish, xpath
from twisted.internet import reactor
@@ -215,7 +215,7 @@ def test(q, bus, conn, stream):
assert len(tubes) == 1, unwrap(tubes)
expected_tube = (stream_tube_id, tubes_self_handle, TUBE_TYPE_STREAM,
'echo', sample_parameters, TUBE_STATE_OPEN)
- check_tube_in_tubes(expected_tube, tubes)
+ t.check_tube_in_tubes(expected_tube, tubes)
# FIXME: if we use an unknown JID here, everything fails
# (the code uses lookup where it should use ensure)
diff --git a/tests/twisted/tubes/offer-private-dbus-tube-ibb.py b/tests/twisted/tubes/offer-private-dbus-tube-ibb.py
index a5c998b..a5da8da 100644
--- a/tests/twisted/tubes/offer-private-dbus-tube-ibb.py
+++ b/tests/twisted/tubes/offer-private-dbus-tube-ibb.py
@@ -9,7 +9,7 @@ from dbus.lowlevel import SignalMessage
from servicetest import call_async, EventPattern
from gabbletest import exec_test, make_result_iq, acknowledge_iq, sync_stream
from constants import *
-from tubetestutil import *
+import tubetestutil as t
from twisted.words.xish import domish, xpath
from ns import DISCO_INFO, TUBES, SI, FEATURE_NEG, IBB, MUC_BYTESTREAM, X_DATA
@@ -171,7 +171,7 @@ def offer_old_dbus_tube(q, bus, conn, stream, self_handle, alice_handle):
assert len(tubes) == 1
expected_tube = (dbus_tube_id, self_handle, TUBE_TYPE_DBUS,
'com.example.TestCase', sample_parameters, TUBE_STATE_REMOTE_PENDING)
- check_tube_in_tubes(expected_tube, tubes)
+ t.check_tube_in_tubes(expected_tube, tubes)
dbus_stream_id = alice_accepts_tube(q, stream, iq_event, dbus_tube_id)
@@ -296,7 +296,7 @@ def offer_new_dbus_tube(q, bus, conn, stream, self_handle, alice_handle):
assert len(tubes) == 1
expected_tube = (None, self_handle, TUBE_TYPE_DBUS, 'com.example.TestCase',
sample_parameters, TUBE_STATE_REMOTE_PENDING)
- check_tube_in_tubes(expected_tube, tubes)
+ t.check_tube_in_tubes(expected_tube, tubes)
status = tube_chan.Get(CHANNEL_IFACE_TUBE, 'State', dbus_interface=PROPERTIES_IFACE)
assert status == TUBE_STATE_REMOTE_PENDING
--
1.5.6.5
More information about the telepathy-commits
mailing list