[Telepathy-commits] [telepathy-gabble/master] Remove unused parameters to check_conn_properties

[Will Thompson]

---
 .../offer-accept-private-dbus-stream-tube-ibb.py   |   10 +++++-----
 ...offer-accept-private-dbus-stream-tube-socks5.py |   12 ++++++------
 tests/twisted/tubes/tubetestutil.py                |    2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

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 e6beeea..79072a9 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
@@ -125,7 +125,7 @@ def test(q, bus, conn, stream):
     set_up_echo("")
     set_up_echo("2")
 
-    check_conn_properties(q, bus, conn, stream)
+    check_conn_properties(q, conn)
 
     conn.Connect()
 
@@ -236,7 +236,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, bus, conn, stream, [old_tubes_channel_properties])
+    check_conn_properties(q, conn, [old_tubes_channel_properties])
 
     # Try to CreateChannel with unknown properties
     # Gabble must return an error
@@ -249,7 +249,7 @@ def test(q, bus, conn, stream):
             });
     ret = q.expect_many(EventPattern('dbus-error', method='CreateChannel'))
     # CreateChannel failed, we expect no new channel
-    check_conn_properties(q, bus, conn, stream, [old_tubes_channel_properties])
+    check_conn_properties(q, conn, [old_tubes_channel_properties])
 
     # Try to CreateChannel with missing properties ("Service")
     # Gabble must return an error
@@ -260,7 +260,7 @@ def test(q, bus, conn, stream):
             });
     ret = q.expect_many(EventPattern('dbus-error', method='CreateChannel'))
     # CreateChannel failed, we expect no new channel
-    check_conn_properties(q, bus, conn, stream, [old_tubes_channel_properties])
+    check_conn_properties(q, conn, [old_tubes_channel_properties])
 
     # Try to CreateChannel with correct properties
     # Gabble must succeed
@@ -311,7 +311,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, bus, conn, stream,
+    check_conn_properties(q, conn,
             [old_tubes_channel_properties, stream_tube_channel_properties])
 
     tubes_chan = bus.get_object(conn.bus_name, chan_path)
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 1b275fc..a2265dc 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
@@ -197,7 +197,7 @@ def test(q, bus, conn, stream):
     set_up_echo("")
     set_up_echo("2")
 
-    check_conn_properties(q, bus, conn, stream)
+    check_conn_properties(q, conn)
 
     conn.Connect()
 
@@ -311,7 +311,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, bus, conn, stream, [old_tubes_channel_properties])
+    check_conn_properties(q, conn, [old_tubes_channel_properties])
 
     # Try to CreateChannel with unknown properties
     # Gabble must return an error
@@ -327,7 +327,7 @@ def test(q, bus, conn, stream):
             });
     ret = q.expect_many(EventPattern('dbus-error', method='CreateChannel'))
     # CreateChannel failed, we expect no new channel
-    check_conn_properties(q, bus, conn, stream, [old_tubes_channel_properties])
+    check_conn_properties(q, conn, [old_tubes_channel_properties])
 
     # Try to CreateChannel with missing properties ("Service")
     # Gabble must return an error
@@ -341,7 +341,7 @@ def test(q, bus, conn, stream):
             });
     ret = q.expect_many(EventPattern('dbus-error', method='CreateChannel'))
     # CreateChannel failed, we expect no new channel
-    check_conn_properties(q, bus, conn, stream, [old_tubes_channel_properties])
+    check_conn_properties(q, conn, [old_tubes_channel_properties])
 
     # Try to create a DBusTube.DRAFT channel. This is not implemented yet, so
     # it will fail. But it should not assert.
@@ -359,7 +359,7 @@ def test(q, bus, conn, stream):
             });
     ret = q.expect_many(EventPattern('dbus-error', method='CreateChannel'))
     # CreateChannel failed, we expect no new channel
-    check_conn_properties(q, bus, conn, stream, [old_tubes_channel_properties])
+    check_conn_properties(q, conn, [old_tubes_channel_properties])
 
     # Try to CreateChannel with correct properties
     # Gabble must succeed
@@ -396,7 +396,7 @@ def test(q, bus, conn, stream):
             bob_handle, 'bob at localhost', conn.GetSelfHandle())
     stream_tube_channel_properties = new_sig.args[0][0]
 
-    check_conn_properties(q, bus, conn, stream,
+    check_conn_properties(q, conn,
             [old_tubes_channel_properties, stream_tube_channel_properties])
 
     tubes_chan = bus.get_object(conn.bus_name, chan_path)
diff --git a/tests/twisted/tubes/tubetestutil.py b/tests/twisted/tubes/tubetestutil.py
index d3365d4..e118e88 100644
--- a/tests/twisted/tubes/tubetestutil.py
+++ b/tests/twisted/tubes/tubetestutil.py
@@ -31,7 +31,7 @@ def check_tube_in_tubes(tube, tubes):
     assert False, "tube %s not in %s" % (unwrap (tube), unwrap (tubes))
 
 
-def check_conn_properties(q, bus, conn, stream, channel_list=None):
+def check_conn_properties(q, conn, channel_list=None):
     """
     Check that Connection.Interface.Requests.Channels matches channel_list, and
     that RequestableChannelClasses contains the expected tube types.
-- 
1.5.6.5