summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-01-03 16:16:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-07 10:54:01 +0000
commit8197d0f638a760fc03062c7a9009117d083d7ead (patch)
treea4be42cc52ea28a9baed41dee584342fe64a6e3c
parentc22b0bf66a28324da66caf0660f171cc279a1f2b (diff)
downloadopenembedded-core-contrib-8197d0f638a760fc03062c7a9009117d083d7ead.tar.gz
openembedded-core-contrib-8197d0f638a760fc03062c7a9009117d083d7ead.tar.bz2
openembedded-core-contrib-8197d0f638a760fc03062c7a9009117d083d7ead.zip
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. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/targetcontrol.py2
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py2
-rw-r--r--meta/lib/oeqa/utils/qemutinyrunner.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 59a9c35a09..02ea1c037c 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -196,7 +196,7 @@ class QemuTarget(BaseTarget):
else:
raise bb.build.FuncFailed("%s - FAILED to re-start qemu - check the task log and the boot log" % self.pn)
- def run_serial(self, command, timeout=5):
+ def run_serial(self, command, timeout=60):
return self.runner.run_serial(command, timeout=timeout)
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:
return True
return False
- def run_serial(self, command, raw=False, timeout=5):
+ def run_serial(self, command, raw=False, timeout=60):
# We assume target system have echo to get command status
if not raw:
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):
return self.is_alive()
- def run_serial(self, command, timeout=5):
+ def run_serial(self, command, timeout=60):
self.server_socket.sendall(command+'\n')
data = ''
status = 0