CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

oeqa: runtime: weston: Remove tear down method

Browse Source 
Tear down method is executed even when the tests are disabled. This lead
to SSH being used to run commands on the target, and as it might fail
when no SSH server is present, we had to use ignore_ssh_fails=True here.

Instead, remove log file just before it is created: it will remain on
the target after the test is run, but this should be acceptable.

(From OE-Core rev: 8b119b1a0fa618c03fbee1bcc755785fedd2d923)

Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mathieu Dubois-Briand 2025-10-09 15:37:28 +02:00 committed by Richard Purdie
parent 0faccb809f
commit 1666d6495d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,10 +14,6 @@ import time
class WestonTest(OERuntimeTestCase):
weston_log_file = '/tmp/weston-2.log'
@classmethod
def tearDownClass(cls):
cls.tc.target.run('rm %s' % cls.weston_log_file, ignore_ssh_fails=True)
@OETestDepends(['ssh.SSHTest.test_ssh'])
@OEHasPackage(['weston'])
def test_weston_running(self):
@ -67,6 +63,10 @@ class WestonTest(OERuntimeTestCase):
existing_wl_processes = self.get_processes_of('weston-desktop-shell', 'existing')
existing_weston_processes = self.get_processes_of('weston', 'existing')
# weston log file should be removed, except if test_weston_supports_xwayland() test has to be run.
if 'x11' not in self.td.get('DISTRO_FEATURES'):
self.addCleanup(self.target.run, 'rm -f %s' % self.weston_log_file)
weston_thread = threading.Thread(target=self.run_weston_init)
weston_thread.start()
new_wl_processes, try_cnt = self.get_new_wayland_processes(existing_wl_processes)
@ -83,6 +83,7 @@ class WestonTest(OERuntimeTestCase):
@skipIfNotFeature('x11', 'Test requires x11 to be in DISTRO_FEATURES')
@OEHasPackage(['weston'])
def test_weston_supports_xwayland(self):
self.addCleanup(self.target.run, 'rm -f %s' % self.weston_log_file)
cmd ='cat %s | grep "xserver listening on display"' % self.weston_log_file
status, output = self.target.run(cmd)
msg = ('xwayland does not appear to be running')