Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 24931 into eclair

Browse Source 
* changes:
  Fix the bogus crashes in layout and reliability tests (the device actually went offline).
This commit is contained in:
Android (Google) Code Review
2009-09-14 18:21:51 -04:00
parent 944808f392 ad1e25da74
commit 55bfddad19
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/DumpRenderTree/assets/run_layout_tests.py
View File

@@ -197,7 +197,17 @@ def main(options, args):
logging.error("DumpRenderTree crashed, output:\n" + adb_output) logging.error("DumpRenderTree crashed, output:\n" + adb_output)
shell_cmd_str = adb_cmd + " shell cat /sdcard/android/running_test.txt" shell_cmd_str = adb_cmd + " shell cat /sdcard/android/running_test.txt"
crashed_test = subprocess.Popen(shell_cmd_str, shell=True, stdout=subprocess.PIPE).communicate()[0] crashed_test = ""
while not crashed_test:
(crashed_test, err) = subprocess.Popen(
shell_cmd_str, shell=True, stdout=subprocess.PIPE,
stderr=subprocess.PIPE).communicate()
crashed_test = crashed_test.strip()
if not crashed_test:
logging.error('Cannot get crashed test name, device offline?')
logging.error('stderr: ' + err)
logging.error('retrying in 10s...')
time.sleep(10)
logging.info(crashed_test + " CRASHED"); logging.info(crashed_test + " CRASHED");
crashed_tests.append(crashed_test); crashed_tests.append(crashed_test);

14
tests/DumpRenderTree/assets/run_reliability_tests.py
View File

@@ -195,8 +195,18 @@ def main(options, args):
while not DumpRenderTreeFinished(adb_cmd): while not DumpRenderTreeFinished(adb_cmd):
logging.error("DumpRenderTree exited before all URLs are visited.") logging.error("DumpRenderTree exited before all URLs are visited.")
shell_cmd_str = adb_cmd + " shell cat " + TEST_STATUS_FILE shell_cmd_str = adb_cmd + " shell cat " + TEST_STATUS_FILE
crashed_test = subprocess.Popen(shell_cmd_str, shell=True, crashed_test = ""
stdout=subprocess.PIPE).communicate()[0] while not crashed_test:
(crashed_test, err) = subprocess.Popen(
shell_cmd_str, shell=True, stdout=subprocess.PIPE,
stderr=subprocess.PIPE).communicate()
crashed_test = crashed_test.strip()
if not crashed_test:
logging.error('Cannot get crashed test name, device offline?')
logging.error('stderr: ' + err)
logging.error('retrying in 10s...')
time.sleep(10)
logging.info(crashed_test + " CRASHED") logging.info(crashed_test + " CRASHED")
crashed_tests.append(crashed_test) crashed_tests.append(crashed_test)
Bugreport(crashed_test, bugreport_dir, adb_cmd) Bugreport(crashed_test, bugreport_dir, adb_cmd)