mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

oeqa/runtime/ssh: add retry logic and sleeps to allow for slower systems

Browse Source 
On exceptionally slow systems, the ssh test can intermittently fail due
to a race between when ping works and the networking applications being
brought up.  To work around this issue, add some retry logic when ssh
fails to connect.  According to the man page of ssh, "ssh exits
with the exit status of the remote command or with 255 if an error
occurred."  So, only retry if the return code is 255, and limit the
number of retries to prevent it looping forever.

(From OE-Core rev: f0fe0b490d309cdf1c97754f85a61b5b948b7f28)

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jon Mason
2024-06-24 18:20:24 -04:00
committed by Richard Purdie
parent ceb6a4ecf9
commit a65a3dd4aa
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
meta/lib/oeqa/runtime/cases/ssh.py
View File

@@ -4,6 +4,8 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
import time
from oeqa.runtime.case import OERuntimeTestCase from oeqa.runtime.case import OERuntimeTestCase
from oeqa.core.decorator.depends import OETestDepends from oeqa.core.decorator.depends import OETestDepends
from oeqa.runtime.decorator.package import OEHasPackage from oeqa.runtime.decorator.package import OEHasPackage
@@ -13,12 +15,20 @@ class SSHTest(OERuntimeTestCase):
@OETestDepends(['ping.PingTest.test_ping']) @OETestDepends(['ping.PingTest.test_ping'])
@OEHasPackage(['dropbear', 'openssh-sshd']) @OEHasPackage(['dropbear', 'openssh-sshd'])
def test_ssh(self): def test_ssh(self):
(status, output) = self.target.run('sleep 20', timeout=2) for i in range(5):
msg='run() timed out but return code was zero.' status, output = self.target.run("uname -a", timeout=5)
self.assertNotEqual(status, 0, msg=msg) if status == 0:
(status, output) = self.target.run('uname -a') break
self.assertEqual(status, 0, msg='SSH Test failed: %s' % output) elif status == 255:
(status, output) = self.target.run('cat /etc/controllerimage') # ssh returns 255 only if a ssh error occurs. This could
msg = "This isn't the right image - /etc/controllerimage " \ # be an issue with "Connection refused" because the port
"shouldn't be here %s" % output # isn't open yet, and this could check explicitly for that
self.assertEqual(status, 1, msg=msg) # here. However, let's keep it simple and just retry for
# all errors a limited amount of times with a sleep to
# give it time for the port to open.
time.sleep(5)
continue
else:
self.fail("uname failed with \"%s\"" %output)
if status == 255:
self.fail("ssh error %s" %output)