diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-08-31 13:33:45 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-08-31 15:37:17 +0100 |
| commit | 09c862d4fcf8b15a9fd92b5112d5dc7cdf6e8929 (patch) | |
| tree | df8464b0db483cd3e1bdb62ada28285f2366c8e3 /tests | |
| parent | 1c24940a5f2e38ba4027b6b48a2166deeab91219 (diff) | |
tests: move all of make_mc to mctest
I have no idea why part of it was in servicetest.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/twisted/mctest.py | 8 | ||||
| -rw-r--r-- | tests/twisted/servicetest.py | 11 |
2 files changed, 7 insertions, 12 deletions
diff --git a/tests/twisted/mctest.py b/tests/twisted/mctest.py index 99210219..bd0db02c 100644 --- a/tests/twisted/mctest.py +++ b/tests/twisted/mctest.py @@ -40,7 +40,13 @@ def make_mc(bus, event_func, params=None): if params: default_params.update(params) - return servicetest.make_mc(bus, event_func, default_params) + mc = bus.get_object( + cs.tp_name_prefix + '.MissionControl5', + cs.tp_path_prefix + '/MissionControl5', + follow_name_owner_changes=True) + assert mc is not None + + return mc def install_colourer(): def red(s): diff --git a/tests/twisted/servicetest.py b/tests/twisted/servicetest.py index 36ff6683..0d001709 100644 --- a/tests/twisted/servicetest.py +++ b/tests/twisted/servicetest.py @@ -484,17 +484,6 @@ class ProxyWrapper: return getattr(self.default_interface, name) -def make_mc(bus, event_func, params): - mc = bus.get_object( - tp_name_prefix + '.MissionControl5', - tp_path_prefix + '/MissionControl5', - follow_name_owner_changes=True) - assert mc is not None - - return mc - - - def wrap_channel(chan, type_, extra=None): interfaces = { type_: tp_name_prefix + '.Channel.Type.' + type_, |