[telepathy-gabble/master] add an access_control param to D-Bus tube tests
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Tue May 26 02:30:12 PDT 2009
---
tests/twisted/tubes/accept-muc-dbus-tube.py | 8 +++++---
tests/twisted/tubes/accept-private-dbus-tube.py | 6 +++---
tests/twisted/tubes/offer-muc-dbus-tube.py | 8 +++++---
tests/twisted/tubes/offer-private-dbus-tube.py | 11 ++++++-----
tests/twisted/tubes/tubetestutil.py | 3 +++
5 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/tests/twisted/tubes/accept-muc-dbus-tube.py b/tests/twisted/tubes/accept-muc-dbus-tube.py
index 96579fa..e437a30 100644
--- a/tests/twisted/tubes/accept-muc-dbus-tube.py
+++ b/tests/twisted/tubes/accept-muc-dbus-tube.py
@@ -9,7 +9,7 @@ import ns
from mucutil import join_muc_and_check
-def test(q, bus, conn, stream):
+def test(q, bus, conn, stream, access_control):
conn.Connect()
_, iq_event = q.expect_many(
@@ -70,7 +70,7 @@ def test(q, bus, conn, stream):
dbus_names = tube_chan.Get(c.CHANNEL_TYPE_DBUS_TUBE, 'DBusNames', dbus_interface=c.PROPERTIES_IFACE)
assert dbus_names == {bob_handle: bob_bus_name}
- call_async(q, dbus_tube_iface, 'Accept', c.SOCKET_ACCESS_CONTROL_CREDENTIALS)
+ call_async(q, dbus_tube_iface, 'Accept', access_control)
return_event, names_changed, presence_event = q.expect_many(
EventPattern('dbus-return', method='Accept'),
@@ -110,4 +110,6 @@ def test(q, bus, conn, stream):
q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
if __name__ == '__main__':
- exec_test(test)
+ # We can't use t.exec_dbus_tube_test() as we can use only the muc bytestream
+ exec_test(lambda q, bus, conn, stream:
+ test(q, bus, conn, stream, c.SOCKET_ACCESS_CONTROL_CREDENTIALS))
diff --git a/tests/twisted/tubes/accept-private-dbus-tube.py b/tests/twisted/tubes/accept-private-dbus-tube.py
index 4601aa6..280b8ea 100644
--- a/tests/twisted/tubes/accept-private-dbus-tube.py
+++ b/tests/twisted/tubes/accept-private-dbus-tube.py
@@ -25,7 +25,7 @@ def contact_offer_dbus_tube(bytestream, tube_id):
bytestream.stream.send(iq)
-def test(q, bus, conn, stream, bytestream_cls):
+def test(q, bus, conn, stream, bytestream_cls, access_control):
t.check_conn_properties(q, conn)
conn.Connect()
@@ -169,7 +169,7 @@ def test(q, bus, conn, stream, bytestream_cls):
assert False
# accept the tube (new API)
- call_async(q, dbus_tube_iface, 'Accept', cs.SOCKET_ACCESS_CONTROL_CREDENTIALS)
+ call_async(q, dbus_tube_iface, 'Accept', access_control)
# Init the bytestream
events, state_event = bytestream.open_bytestream(
@@ -202,4 +202,4 @@ def test(q, bus, conn, stream, bytestream_cls):
q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
if __name__ == '__main__':
- t.exec_tube_test(test)
+ t.exec_dbus_tube_test(test)
diff --git a/tests/twisted/tubes/offer-muc-dbus-tube.py b/tests/twisted/tubes/offer-muc-dbus-tube.py
index f58dd89..81ad300 100644
--- a/tests/twisted/tubes/offer-muc-dbus-tube.py
+++ b/tests/twisted/tubes/offer-muc-dbus-tube.py
@@ -87,7 +87,7 @@ def fire_signal_on_tube(q, tube, chatroom, dbus_stream_id, my_bus_name):
# being in the message somewhere
assert my_bus_name in binary
-def test(q, bus, conn, stream):
+def test(q, bus, conn, stream, access_control):
conn.Connect()
_, iq_event = q.expect_many(
@@ -254,7 +254,7 @@ def test(q, bus, conn, stream):
assert False
# offer the tube
- call_async(q, dbus_tube_iface, 'Offer', sample_parameters, cs.SOCKET_ACCESS_CONTROL_CREDENTIALS)
+ call_async(q, dbus_tube_iface, 'Offer', sample_parameters, access_control)
new_tube_event, presence_event, return_event, status_event, dbus_changed_event = q.expect_many(
EventPattern('dbus-signal', signal='NewTube'),
@@ -348,4 +348,6 @@ def test(q, bus, conn, stream):
q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
if __name__ == '__main__':
- exec_test(test)
+ # We can't use t.exec_dbus_tube_test() as we can use only the muc bytestream
+ exec_test(lambda q, bus, conn, stream:
+ test(q, bus, conn, stream, cs.SOCKET_ACCESS_CONTROL_CREDENTIALS))
diff --git a/tests/twisted/tubes/offer-private-dbus-tube.py b/tests/twisted/tubes/offer-private-dbus-tube.py
index fb0c21e..7618647 100644
--- a/tests/twisted/tubes/offer-private-dbus-tube.py
+++ b/tests/twisted/tubes/offer-private-dbus-tube.py
@@ -162,7 +162,8 @@ def offer_old_dbus_tube(q, bus, conn, stream, self_handle, alice_handle, bytestr
q.expect('dbus-signal', signal='Closed')
-def offer_new_dbus_tube(q, bus, conn, stream, self_handle, alice_handle, bytestream_cls):
+def offer_new_dbus_tube(q, bus, conn, stream, self_handle, alice_handle,
+ bytestream_cls, access_control):
# Offer a tube to Alice (new API)
@@ -245,7 +246,7 @@ def offer_new_dbus_tube(q, bus, conn, stream, self_handle, alice_handle, bytestr
# IQ be sent to Alice. We sync the stream to ensure the IQ would have
# arrived if it had been sent.
sync_stream(q, stream)
- call_async(q, dbus_tube_iface, 'Offer', sample_parameters, cs.SOCKET_ACCESS_CONTROL_CREDENTIALS)
+ call_async(q, dbus_tube_iface, 'Offer', sample_parameters, access_control)
offer_return_event, iq_event, new_tube_event, state_event = q.expect_many(
EventPattern('dbus-return', method='Offer'),
EventPattern('stream-iq', to='alice at localhost/Test'),
@@ -274,7 +275,7 @@ def offer_new_dbus_tube(q, bus, conn, stream, self_handle, alice_handle, bytestr
EventPattern('dbus-signal', signal='Closed'),
EventPattern('dbus-signal', signal='ChannelClosed'))
-def test(q, bus, conn, stream, bytestream_cls):
+def test(q, bus, conn, stream, bytestream_cls, access_control):
conn.Connect()
_, disco_event = q.expect_many(
@@ -307,11 +308,11 @@ def test(q, bus, conn, stream, bytestream_cls):
sync_stream(q, stream)
offer_old_dbus_tube(q, bus, conn, stream, self_handle, alice_handle, bytestream_cls)
- offer_new_dbus_tube(q, bus, conn, stream, self_handle, alice_handle, bytestream_cls)
+ offer_new_dbus_tube(q, bus, conn, stream, self_handle, alice_handle, bytestream_cls, access_control)
# OK, we're done
conn.Disconnect()
q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
if __name__ == '__main__':
- t.exec_tube_test(test)
+ t.exec_dbus_tube_test(test)
diff --git a/tests/twisted/tubes/tubetestutil.py b/tests/twisted/tubes/tubetestutil.py
index 2f42a62..2572526 100644
--- a/tests/twisted/tubes/tubetestutil.py
+++ b/tests/twisted/tubes/tubetestutil.py
@@ -361,3 +361,6 @@ def exec_stream_tube_test(test):
exec_tube_test(test, cs.SOCKET_ADDRESS_TYPE_IPV4, cs.SOCKET_ACCESS_CONTROL_LOCALHOST, "")
exec_tube_test(test, cs.SOCKET_ADDRESS_TYPE_UNIX, cs.SOCKET_ACCESS_CONTROL_CREDENTIALS, dbus.Byte(77))
exec_tube_test(test, cs.SOCKET_ADDRESS_TYPE_IPV4, cs.SOCKET_ACCESS_CONTROL_PORT, ('127.0.0.1', dbus.UInt16(8631)))
+
+def exec_dbus_tube_test(test):
+ exec_tube_test(test, cs.SOCKET_ACCESS_CONTROL_CREDENTIALS)
--
1.5.6.5
More information about the telepathy-commits
mailing list