mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
@@ -17,7 +17,7 @@ class SSHTest(OERuntimeTestCase):
|
|||||||
@OEHasPackage(['dropbear', 'openssh-sshd'])
|
@OEHasPackage(['dropbear', 'openssh-sshd'])
|
||||||
def test_ssh(self):
|
def test_ssh(self):
|
||||||
for i in range(5):
|
for i in range(5):
|
||||||
status, output = self.target.run("uname -a", timeout=5)
|
status, output = self.target.run("uname -a", timeout=30)
|
||||||
if status == 0:
|
if status == 0:
|
||||||
break
|
break
|
||||||
elif status == 255 or status == -signal.SIGTERM:
|
elif status == 255 or status == -signal.SIGTERM:
|
||||||
@@ -29,7 +29,7 @@ class SSHTest(OERuntimeTestCase):
|
|||||||
# give it time for the port to open.
|
# give it time for the port to open.
|
||||||
# We sometimes see -15 (SIGTERM) on slow emulation machines too, likely
|
# We sometimes see -15 (SIGTERM) on slow emulation machines too, likely
|
||||||
# from boot/init not being 100% complete, retry for these too.
|
# from boot/init not being 100% complete, retry for these too.
|
||||||
time.sleep(30)
|
time.sleep(5)
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
self.fail("uname failed with \"%s\" (exit code %s)" % (output, status))
|
self.fail("uname failed with \"%s\" (exit code %s)" % (output, status))
|
||||||
|
|||||||
Reference in New Issue
Block a user