mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

oeqa: runtime: Ignore SSH errors during setup and tear down

Browse Source 
Tests using SSH will fail when no SSH server is present on the target.
These tests are disabled in these cases, by being marked with a
dependency on ssh.SSHTest.test_ssh, which in turns has a dependency on
having either dropbear or openssh-sshd in the image.

But setUpClass() and tearDownClass() functions are always executed, even
on tests failing the dependency checks, leading to unexpected failed
tests.

Ignoring SSH errors in setup and tear down allows to avoid these test
errors.

(From OE-Core rev: 5bcc914cf5a193137cddc004f3b38b7b04af9ecb)

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-07 19:38:07 +02:00
committed by Richard Purdie
parent 8810c1deb0
commit 55f1f00d25
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
meta/lib/oeqa/runtime/cases/logrotate.py
View File

@@ -15,12 +15,13 @@ class LogrotateTest(OERuntimeTestCase):
@classmethod
def setUpClass(cls):
cls.tc.target.run('cp /etc/logrotate.d/wtmp $HOME/wtmp.oeqabak')
cls.tc.target.run('cp /etc/logrotate.d/wtmp $HOME/wtmp.oeqabak',
ignore_ssh_fails=True)
@classmethod
def tearDownClass(cls):
cls.tc.target.run('mv -f $HOME/wtmp.oeqabak /etc/logrotate.d/wtmp && rm -rf /var/log//logrotate_dir')
cls.tc.target.run('rm -rf /var/log/logrotate_testfile && rm -rf /etc/logrotate.d/logrotate_testfile')
cls.tc.target.run('mv -f $HOME/wtmp.oeqabak /etc/logrotate.d/wtmp && rm -rf /var/log//logrotate_dir', ignore_ssh_fails=True)
cls.tc.target.run('rm -rf /var/log/logrotate_testfile && rm -rf /etc/logrotate.d/logrotate_testfile', ignore_ssh_fails=True)
@OETestDepends(['ssh.SSHTest.test_ssh'])
@OEHasPackage(['logrotate'])

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

@@ -16,7 +16,7 @@ class WestonTest(OERuntimeTestCase):
@classmethod
def tearDownClass(cls):
cls.tc.target.run('rm %s' % cls.weston_log_file)
cls.tc.target.run('rm %s' % cls.weston_log_file, ignore_ssh_fails=True)
@OETestDepends(['ssh.SSHTest.test_ssh'])
@OEHasPackage(['weston'])