summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/utils
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-02-06 16:38:30 +0000
commit938ada24fb33103df6f532aae41b6ec6562e78ff (patch)
tree90d70d0807e6ea3e1ee70651b24caf95529ba093 /meta/lib/oeqa/utils
parenta384248938ea9db096866bf4ec8678d35ca62a12 (diff)
downloadpoky-938ada24fb33103df6f532aae41b6ec6562e78ff.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) (From OE-Core rev: 70e942e77493cb5851a78c5592b4e13de860d931) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.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.py2
-rw-r--r--meta/lib/oeqa/utils/qemutinyrunner.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index f7fbe1bb04..cc95dc2990 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -421,7 +421,7 @@ class QemuRunner:
421 return True 421 return True
422 return False 422 return False
423 423
424 def run_serial(self, command, raw=False, timeout=5): 424 def run_serial(self, command, raw=False, timeout=60):
425 # We assume target system have echo to get command status 425 # We assume target system have echo to get command status
426 if not raw: 426 if not raw:
427 command = "%s; echo $?\n" % command 427 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