diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2019-01-03 16:16:32 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-07 10:54:13 +0000 |
commit | fbb390a17ffcc19356246104d693779c438458f0 (patch) | |
tree | 96ad179b8dd64a21eb565a51c1847bbbf6d45ccd /meta/lib/oeqa/utils | |
parent | 445acdffe0a75bf9ce94c1fc31bebc7c5bd60be8 (diff) | |
download | poky-fbb390a17ffcc19356246104d693779c438458f0.tar.gz |
oeqa/utils/qemurunner: set timeout to 60s for run_serial
The 5s timeout for non-kvm is too short, especially when the load is high,
which leads to unexpected errors, so set timeout to 60s by default.
(From OE-Core rev: 8197d0f638a760fc03062c7a9009117d083d7ead)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils')
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/utils/qemutinyrunner.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index cce95e13f4..7ef506b60a 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
@@ -430,7 +430,7 @@ class QemuRunner: | |||
430 | return True | 430 | return True |
431 | return False | 431 | return False |
432 | 432 | ||
433 | def run_serial(self, command, raw=False, timeout=5): | 433 | def run_serial(self, command, raw=False, timeout=60): |
434 | # We assume target system have echo to get command status | 434 | # We assume target system have echo to get command status |
435 | if not raw: | 435 | if not raw: |
436 | command = "%s; echo $?\n" % command | 436 | command = "%s; echo $?\n" % command |
diff --git a/meta/lib/oeqa/utils/qemutinyrunner.py b/meta/lib/oeqa/utils/qemutinyrunner.py index 63b5d1648b..5aa99d0686 100644 --- a/meta/lib/oeqa/utils/qemutinyrunner.py +++ b/meta/lib/oeqa/utils/qemutinyrunner.py | |||
@@ -108,7 +108,7 @@ class QemuTinyRunner(QemuRunner): | |||
108 | 108 | ||
109 | return self.is_alive() | 109 | return self.is_alive() |
110 | 110 | ||
111 | def run_serial(self, command, timeout=5): | 111 | def run_serial(self, command, timeout=60): |
112 | self.server_socket.sendall(command+'\n') | 112 | self.server_socket.sendall(command+'\n') |
113 | data = '' | 113 | data = '' |
114 | status = 0 | 114 | status = 0 |