summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2018-05-17 19:07:39 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2018-05-17 19:07:39 +0800
commit53fca106981aa3c8ee9576041ebdab4d2c691cfa (patch)
tree0bae1a558e8c39437ccceb9c612b085dbfe47114
parentb0116770a0bed0ff313ea693993687ddd90ebe40 (diff)
tradefed-runner.py: set searchwindowsize for pexpect.spawn
to work around the timed out problem when run cts opengl test did not find the root cause yet, so set searchwindowsize to 1024 might not very accurate. When tested on local side, it could help to finish CtsDeqpTestCases module less than 90 minutes, so this should help on the opgengl timed out problem on lava Change-Id: I9507bc09e1336ed7f41514ba241d9e939ea074e4 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
-rwxr-xr-xautomated/android/tradefed/tradefed-runner.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/automated/android/tradefed/tradefed-runner.py b/automated/android/tradefed/tradefed-runner.py
index b5e966c..36172fc 100755
--- a/automated/android/tradefed/tradefed-runner.py
+++ b/automated/android/tradefed/tradefed-runner.py
@@ -204,7 +204,7 @@ if command == 'android-vts/tools/vts-tradefed' and \
monitor_cmd = 'android-vts/testcases/vts/script/monitor-runner-output.py -m'
monitor_vts_output = subprocess.Popen(shlex.split(monitor_cmd), stderr=subprocess.STDOUT, stdout=vts_run_details)
-child = pexpect.spawn(command, logfile=tradefed_stdout)
+child = pexpect.spawn(command, logfile=tradefed_stdout, searchwindowsize=1024)
try:
child.expect(prompt, timeout=60)
child.sendline(args.TEST_PARAMS)
@@ -244,11 +244,12 @@ while child.isalive():
m = child.expect(['ResultReporter: Full Result:',
'ConsoleReporter:.*Test run failed to complete.',
pexpect.TIMEOUT],
+ searchwindowsize=1024,
timeout=60)
# Once all tests finshed, exit from tf shell to throw EOF, which sets child.isalive() to false.
if m == 0:
try:
- child.expect(prompt, timeout=60)
+ child.expect(prompt, searchwindowsize=1024, timeout=60)
logger.debug('Sending "exit" command to TF shell...')
child.sendline('exit')
child.expect(pexpect.EOF, timeout=60)