mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-05 08:02:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

oeqa/weston: Fix tests to run with systemd

Browse Source 
Currently, weston tests fail when using systemd, fix it by providing
transient unit file and inject it via systemd-run, which generates a
service file automatically and launches another weston instance to test
if it can launch a nested instance. Use systemctl stop to end the
service and cleanup, instead of brutal kill

(From OE-Core rev: 7572158b861cb5d4ebf6360ced08ab41419d74d3)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2020-09-13 14:52:43 -07:00
committed by Richard Purdie
parent 8d04a52f48
commit bdfc4fb0e9
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meta/lib/oeqa/runtime/cases/weston.py
View File

@@ -34,7 +34,10 @@ class WestonTest(OERuntimeTestCase):
return 'export XDG_RUNTIME_DIR=/run/user/0; export WAYLAND_DISPLAY=wayland-0; %s' % cmd
def run_weston_init(self):
self.target.run(self.get_weston_command('weston --log=%s' % self.weston_log_file))
if 'systemd' in self.tc.td['DISTRO_FEATURES']:
self.target.run('systemd-run --collect --unit=weston-ptest.service --uid=0 -p PAMName=login -p TTYPath=/dev/tty6 -E XDG_RUNTIME_DIR=/tmp -E WAYLAND_DISPLAY=wayland-0 /usr/bin/weston --socket=wayland-1 --log=%s' % self.weston_log_file)
else:
self.target.run(self.get_weston_command('openvt -- weston --socket=wayland-1 --log=%s' % self.weston_log_file))
def get_new_wayland_processes(self, existing_wl_processes):
try_cnt = 0
@@ -63,7 +66,10 @@ class WestonTest(OERuntimeTestCase):
new_wl_processes, try_cnt = self.get_new_wayland_processes(existing_wl_processes)
existing_and_new_weston_processes = self.get_processes_of('weston', 'existing and new')
new_weston_processes = [x for x in existing_and_new_weston_processes if x not in existing_weston_processes]
for w in new_weston_processes:
self.target.run('kill -9 %s' % w)
if 'systemd' in self.tc.td['DISTRO_FEATURES']:
self.target.run('systemctl stop weston-ptest.service')
else:
for w in new_weston_processes:
self.target.run('kill -9 %s' % w)
__, weston_log = self.target.run('cat %s' % self.weston_log_file)
self.assertTrue(new_wl_processes, msg='Could not get new weston-desktop-shell processes (%s, try_cnt:%s) weston log: %s' % (new_wl_processes, try_cnt, weston_log))