Put cleanup steps in finally block so cleanup happens after halt on failure.
The device_status_check hangs because there are still processes launched by the buildbot script that are not cleaned up. E.g. https://chromegw.corp.google.com/i/clank/builders/manta-sharded-official-perf-clankium/builds/2359 This makes sure the post commands are executed after halt on failure. BUG=265578 Review URL: https://chromiumcodereview.appspot.com/21261006 git-svn-id: http://src.chromium.org/svn/trunk/src/build@215365 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
1a1a93bb74
Коммит
a95cc35c5e
|
@ -306,14 +306,8 @@ def GenerateTestReport(options):
|
||||||
os.remove(report)
|
os.remove(report)
|
||||||
|
|
||||||
|
|
||||||
def GetPostTestStepCmds():
|
|
||||||
return [
|
|
||||||
('logcat_dump', LogcatDump),
|
|
||||||
('test_report', GenerateTestReport)
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def MainTestWrapper(options):
|
def MainTestWrapper(options):
|
||||||
|
try:
|
||||||
# Spawn logcat monitor
|
# Spawn logcat monitor
|
||||||
SpawnLogcatMonitor()
|
SpawnLogcatMonitor()
|
||||||
|
|
||||||
|
@ -331,9 +325,13 @@ def MainTestWrapper(options):
|
||||||
if options.experimental:
|
if options.experimental:
|
||||||
RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES)
|
RunTestSuites(options, gtest_config.EXPERIMENTAL_TEST_SUITES)
|
||||||
|
|
||||||
|
finally:
|
||||||
# Run all post test steps
|
# Run all post test steps
|
||||||
for _, cmd in GetPostTestStepCmds():
|
LogcatDump(options)
|
||||||
cmd(options)
|
GenerateTestReport(options)
|
||||||
|
# KillHostHeartbeat() has logic to check if heartbeat process is running,
|
||||||
|
# and kills only if it finds the process is running on the host.
|
||||||
|
provision_devices.KillHostHeartbeat()
|
||||||
|
|
||||||
|
|
||||||
def GetDeviceStepsOptParser():
|
def GetDeviceStepsOptParser():
|
||||||
|
@ -377,7 +375,6 @@ def main(argv):
|
||||||
setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
|
setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
|
||||||
|
|
||||||
MainTestWrapper(options)
|
MainTestWrapper(options)
|
||||||
provision_devices.KillHostHeartbeat()
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
Загрузка…
Ссылка в новой задаче