[telepathy-gabble/master] pass the queue to check_new_connection_access
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Thu May 7 07:42:29 PDT 2009
This will be useful when we'll check the byte control
---
tests/twisted/tubes/offer-muc-stream-tube.py | 2 +-
tests/twisted/tubes/offer-private-stream-tube.py | 4 ++--
tests/twisted/tubes/tubetestutil.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/twisted/tubes/offer-muc-stream-tube.py b/tests/twisted/tubes/offer-muc-stream-tube.py
index 896204d..26ecd1f 100644
--- a/tests/twisted/tubes/offer-muc-stream-tube.py
+++ b/tests/twisted/tubes/offer-muc-stream-tube.py
@@ -326,7 +326,7 @@ def test(q, bus, conn, stream, bytestream_cls,
assert handle == bob_handle
protocol = socket_event.protocol
- t.check_new_connection_access(access_control, access, protocol)
+ t.check_new_connection_access(q, access_control, access, protocol)
# handle iq_event
bytestream.check_si_reply(iq_event.stanza)
diff --git a/tests/twisted/tubes/offer-private-stream-tube.py b/tests/twisted/tubes/offer-private-stream-tube.py
index 6ab9f56..8ab15cd 100644
--- a/tests/twisted/tubes/offer-private-stream-tube.py
+++ b/tests/twisted/tubes/offer-private-stream-tube.py
@@ -343,7 +343,7 @@ def test(q, bus, conn, stream, bytestream_cls,
handle, access = new_conn_event.args
assert handle == bob_handle
protocol = socket_event.protocol
- t.check_new_connection_access(access_control, access, protocol)
+ t.check_new_connection_access(q, access_control, access, protocol)
expected_tube = (stream_tube_id, self_handle, cs.TUBE_TYPE_STREAM, 'echo',
sample_parameters, cs.TUBE_STATE_OPEN)
@@ -375,7 +375,7 @@ def test(q, bus, conn, stream, bytestream_cls,
handle, access = new_conn_event.args
assert handle == bob_handle
protocol = socket_event.protocol
- t.check_new_connection_access(access_control, access, protocol)
+ t.check_new_connection_access(q, access_control, access, protocol)
expected_tube = (new_stream_tube_id, self_handle, cs.TUBE_TYPE_STREAM,
'newecho', new_sample_parameters, cs.TUBE_STATE_OPEN)
diff --git a/tests/twisted/tubes/tubetestutil.py b/tests/twisted/tubes/tubetestutil.py
index e8f004c..73adb23 100644
--- a/tests/twisted/tubes/tubetestutil.py
+++ b/tests/twisted/tubes/tubetestutil.py
@@ -266,7 +266,7 @@ def create_server(q, address_type, factory=None, block_reading=False):
else:
assert False
-def check_new_connection_access(access_control, access_control_param, protocol):
+def check_new_connection_access(q, access_control, access_control_param, protocol):
if access_control == cs.SOCKET_ACCESS_CONTROL_LOCALHOST:
# nothing to check
return
--
1.5.6.5
More information about the telepathy-commits
mailing list