tests/dbus-runner: Move service launching into helper
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3973>
This commit is contained in:
parent
63b59dfa89
commit
6b0f7294db
1 changed files with 6 additions and 2 deletions
|
@ -60,8 +60,7 @@ class MutterDBusRunner(DBusTestCase):
|
||||||
print('Launching required services...', file=sys.stderr)
|
print('Launching required services...', file=sys.stderr)
|
||||||
klass.service_processes = []
|
klass.service_processes = []
|
||||||
for service in launch:
|
for service in launch:
|
||||||
print(' - Launching {}'.format(service), file=sys.stderr)
|
klass.launch_service([service])
|
||||||
klass.service_processes += [subprocess.Popen(service)]
|
|
||||||
|
|
||||||
print('Starting mocked services...', file=sys.stderr)
|
print('Starting mocked services...', file=sys.stderr)
|
||||||
(klass.mocks_manager, klass.mock_obj) = klass.start_from_local_template(
|
(klass.mocks_manager, klass.mock_obj) = klass.start_from_local_template(
|
||||||
|
@ -262,6 +261,11 @@ ret = logind_helpers.open_file_direct(major, minor)
|
||||||
return template_path
|
return template_path
|
||||||
raise FileNotFoundError(f'Couldnt find a {template_name} template')
|
raise FileNotFoundError(f'Couldnt find a {template_name} template')
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def launch_service(klass, args):
|
||||||
|
print(' - Launching {}'.format(' '.join(args)), file=sys.stderr)
|
||||||
|
klass.service_processes += [subprocess.Popen(args)]
|
||||||
|
|
||||||
|
|
||||||
def wrap_call(args, wrapper, extra_env):
|
def wrap_call(args, wrapper, extra_env):
|
||||||
env = {}
|
env = {}
|
||||||
|
|
Loading…
Reference in a new issue