Commit 79cfcab1 authored by Sam Maier's avatar Sam Maier Committed by Commit Bot

Fixing fast-local-dev threads ending out of order

Bug: 1049135
Change-Id: I7e06123068b09643e9063f2df9bb04ff1b8b2884
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2039133
Commit-Queue: Sam Maier <smaier@chromium.org>
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738692}
parent 4f45899b
......@@ -662,9 +662,7 @@ class LocalDeviceInstrumentationTestRun(
handle_coverage_data, handle_render_test_data,
pull_ui_screen_captures]
if self._env.concurrent_adb:
post_test_step_thread_group = reraiser_thread.ReraiserThreadGroup(
reraiser_thread.ReraiserThread(f) for f in post_test_steps)
post_test_step_thread_group.StartAll(will_block=True)
reraiser_thread.RunAsync(post_test_steps)
else:
for step in post_test_steps:
step()
......@@ -742,8 +740,6 @@ class LocalDeviceInstrumentationTestRun(
tombstone_filename, 'tombstones') as tombstone_file:
tombstone_file.write('\n'.join(resolved_tombstones))
result.SetLink('tombstones', tombstone_file.Link())
if self._env.concurrent_adb:
post_test_step_thread_group.JoinAll()
return results, None
def _GetTestsFromRunner(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment