diff options
author | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-16 10:50:11 +0100 |
---|---|---|
committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-09-21 19:27:13 +0100 |
commit | 6417d165242ffeb1899108baee3d38709cc8a5e7 (patch) | |
tree | 0f80820aadbf7b75cdd9815c47d2f8937703362a /tests | |
parent | 6362eedfdc4907592d299bac2fe88cd936b62b94 (diff) |
mctest: remove unused event_func arg from make_mc
Diffstat (limited to 'tests')
-rw-r--r-- | tests/twisted/account-manager/auto-connect.py | 2 | ||||
-rw-r--r-- | tests/twisted/account-manager/avatar-persist.py | 2 | ||||
-rw-r--r-- | tests/twisted/account-manager/avatar-refresh.py | 2 | ||||
-rw-r--r-- | tests/twisted/account-manager/make-valid.py | 2 | ||||
-rw-r--r-- | tests/twisted/account-storage/libaccounts-sso-storage.py | 2 | ||||
-rw-r--r-- | tests/twisted/crash-recovery/crash-recovery.py | 2 | ||||
-rw-r--r-- | tests/twisted/dispatcher/create-at-startup.py | 2 | ||||
-rw-r--r-- | tests/twisted/mctest.py | 4 |
8 files changed, 9 insertions, 9 deletions
diff --git a/tests/twisted/account-manager/auto-connect.py b/tests/twisted/account-manager/auto-connect.py index badcf7fc..9f5803a1 100644 --- a/tests/twisted/account-manager/auto-connect.py +++ b/tests/twisted/account-manager/auto-connect.py @@ -79,7 +79,7 @@ def test(q, bus, unused): 'password': r'\\ionstorm\\', } - mc = make_mc(bus, q.append) + mc = make_mc(bus) request_conn, prop_changed, _ = q.expect_many( EventPattern('dbus-method-call', method='RequestConnection', diff --git a/tests/twisted/account-manager/avatar-persist.py b/tests/twisted/account-manager/avatar-persist.py index e1334435..b4cd6570 100644 --- a/tests/twisted/account-manager/avatar-persist.py +++ b/tests/twisted/account-manager/avatar-persist.py @@ -77,7 +77,7 @@ def test(q, bus, unused): 'password': 'ionstorm', } - mc = make_mc(bus, q.append) + mc = make_mc(bus) e, _ = q.expect_many( EventPattern('dbus-method-call', method='RequestConnection', diff --git a/tests/twisted/account-manager/avatar-refresh.py b/tests/twisted/account-manager/avatar-refresh.py index 7cc2d2c8..87895042 100644 --- a/tests/twisted/account-manager/avatar-refresh.py +++ b/tests/twisted/account-manager/avatar-refresh.py @@ -77,7 +77,7 @@ def test(q, bus, unused): 'password': 'ionstorm', } - mc = make_mc(bus, q.append) + mc = make_mc(bus) e, _ = q.expect_many( EventPattern('dbus-method-call', method='RequestConnection', diff --git a/tests/twisted/account-manager/make-valid.py b/tests/twisted/account-manager/make-valid.py index 17d58049..9853b293 100644 --- a/tests/twisted/account-manager/make-valid.py +++ b/tests/twisted/account-manager/make-valid.py @@ -94,7 +94,7 @@ def test(q, bus, unused): q.forbid_events(events) # Wait for MC to load - mc = make_mc(bus, q.append) + mc = make_mc(bus) q.expect_many( EventPattern('dbus-signal', signal='NameOwnerChanged', diff --git a/tests/twisted/account-storage/libaccounts-sso-storage.py b/tests/twisted/account-storage/libaccounts-sso-storage.py index c6b68b6c..af2455e4 100644 --- a/tests/twisted/account-storage/libaccounts-sso-storage.py +++ b/tests/twisted/account-storage/libaccounts-sso-storage.py @@ -30,7 +30,7 @@ import dbus.service from servicetest import EventPattern, tp_name_prefix, tp_path_prefix, \ call_async from mctest import exec_test, create_fakecm_account, get_account_manager, \ - get_fakecm_account, make_mc + get_fakecm_account import constants as cs if ('ACCOUNTS' not in os.environ or not os.environ['ACCOUNTS']): diff --git a/tests/twisted/crash-recovery/crash-recovery.py b/tests/twisted/crash-recovery/crash-recovery.py index da632949..42963772 100644 --- a/tests/twisted/crash-recovery/crash-recovery.py +++ b/tests/twisted/crash-recovery/crash-recovery.py @@ -95,7 +95,7 @@ def test(q, bus, unused): # Service-activate MC. # We're told about the other channel as an observer... - mc = make_mc(bus, q.append) + mc = make_mc(bus) _, _, _, e = q.expect_many( EventPattern('dbus-signal', path='/org/freedesktop/DBus', diff --git a/tests/twisted/dispatcher/create-at-startup.py b/tests/twisted/dispatcher/create-at-startup.py index ceec48bd..6cacfc23 100644 --- a/tests/twisted/dispatcher/create-at-startup.py +++ b/tests/twisted/dispatcher/create-at-startup.py @@ -73,7 +73,7 @@ def test(q, bus, unused): cs.tp_name_prefix + '.ConnectionManager.fakecm', bus=bus) # service-activate MC and immediately make a request - mc = make_mc(bus, q.append) + mc = make_mc(bus) account = bus.get_object(cs.MC, cs.tp_path_prefix + diff --git a/tests/twisted/mctest.py b/tests/twisted/mctest.py index 0a1c7d73..1ef777c1 100644 --- a/tests/twisted/mctest.py +++ b/tests/twisted/mctest.py @@ -33,7 +33,7 @@ from twisted.internet import reactor import dbus import dbus.service -def make_mc(bus, event_func): +def make_mc(bus): mc = bus.get_object( cs.tp_name_prefix + '.MissionControl5', cs.tp_path_prefix + '/MissionControl5', @@ -72,7 +72,7 @@ def wait_for_name(queue, bus, name): predicate=lambda e: e.args[0] == name and e.args[2]) def wait_for_mc(queue, bus): - mc = make_mc(bus, queue.append) + mc = make_mc(bus) wait_for_name(queue, bus, cs.AM) wait_for_name(queue, bus, cs.CD) return mc |