diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-10-13 23:02:16 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-10-14 21:42:17 +0100 |
| commit | d2b2675cc40f55e4a8b27ea921bc4bb98fc2431d (patch) | |
| tree | 73b9ed1d30599c8f3ea3f113c447b746c8e5db59 | |
| parent | d29f43bd0b4644b850e7e4cfe294ffd899bd6e6d (diff) | |
| download | poky-d2b2675cc40f55e4a8b27ea921bc4bb98fc2431d.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: bb991988cb23be2c8947171726ada321f27e6eed)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/runtime/cases/ssh.py | 4 |
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)) |
