summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2024-10-13 23:02:16 +0100
committerSteve Sakoman <steve@sakoman.com>2024-11-26 06:11:30 -0800
commit3fab614b0aed67914d2a9e664a31316a819c33f9 (patch)
tree11f1d78807d56ffd8051ec91faae96a865d85b7d
parentae98542b907e8a524982f4a91c68bdab8d48a843 (diff)
downloadpoky-3fab614b0aed67914d2a9e664a31316a819c33f9.tar.gz
oeqa/runtime/ssh: Fix incorrect timeout fix
I'd meant to change the command timeout in the previous change, fix the correct one. (From OE-Core rev: 419c96d17205fc9485869ab0fc1f27de52c31789) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit bb991988cb23be2c8947171726ada321f27e6eed) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/lib/oeqa/runtime/cases/ssh.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/runtime/cases/ssh.py b/meta/lib/oeqa/runtime/cases/ssh.py
index f5b76edff4..89d64430e5 100644
--- a/meta/lib/oeqa/runtime/cases/ssh.py
+++ b/meta/lib/oeqa/runtime/cases/ssh.py
@@ -17,7 +17,7 @@ class SSHTest(OERuntimeTestCase):
17 @OEHasPackage(['dropbear', 'openssh-sshd']) 17 @OEHasPackage(['dropbear', 'openssh-sshd'])
18 def test_ssh(self): 18 def test_ssh(self):
19 for i in range(5): 19 for i in range(5):
20 status, output = self.target.run("uname -a", timeout=5) 20 status, output = self.target.run("uname -a", timeout=30)
21 if status == 0: 21 if status == 0:
22 break 22 break
23 elif status == 255 or status == -signal.SIGTERM: 23 elif status == 255 or status == -signal.SIGTERM:
@@ -29,7 +29,7 @@ class SSHTest(OERuntimeTestCase):
29 # give it time for the port to open. 29 # give it time for the port to open.
30 # We sometimes see -15 (SIGTERM) on slow emulation machines too, likely 30 # We sometimes see -15 (SIGTERM) on slow emulation machines too, likely
31 # from boot/init not being 100% complete, retry for these too. 31 # from boot/init not being 100% complete, retry for these too.
32 time.sleep(30) 32 time.sleep(5)
33 continue 33 continue
34 else: 34 else:
35 self.fail("uname failed with \"%s\" (exit code %s)" % (output, status)) 35 self.fail("uname failed with \"%s\" (exit code %s)" % (output, status))