Commit ce7d80bd by Yuly Novikov Committed by Angle LUCI CQ

Gold Tests: Fix batch uploading

Uploading to Gold used to stop after the first failure in the batch Bug: angleproject:5966 Change-Id: Iff89c106b18a9aab5a43742a6085c5f9a3c9a188 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2923784Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent b6bd039c
...@@ -372,20 +372,23 @@ def _run_tests(args, tests, extra_flags, env, screenshot_dir, results, test_resu ...@@ -372,20 +372,23 @@ def _run_tests(args, tests, extra_flags, env, screenshot_dir, results, test_resu
'--verbose-logging', '--verbose-logging',
] + extra_flags ] + extra_flags
result = None batch_result = None
for iteration in range(0, args.flaky_retries + 1): for iteration in range(0, args.flaky_retries + 1):
if result != PASS: if batch_result != PASS:
if iteration > 0: if iteration > 0:
logging.info('Test run failed, running retry #%d...' % (iteration + 1)) logging.info('Test run failed, running retry #%d...' % (iteration + 1))
result = PASS if run_wrapper(args, cmd, env, tempfile_path) == 0 else FAIL batch_result = PASS if run_wrapper(args, cmd, env,
tempfile_path) == 0 else FAIL
artifacts = {} artifacts = {}
for trace in batch: for trace in batch:
if result == PASS: if batch_result == PASS:
result = upload_test_result_to_skia_gold(args, gold_session_manager, result = upload_test_result_to_skia_gold(args, gold_session_manager,
gold_session, gold_properties, gold_session, gold_properties,
screenshot_dir, trace, artifacts) screenshot_dir, trace, artifacts)
else:
result = batch_result
expected_result = SKIP if result == SKIP else PASS expected_result = SKIP if result == SKIP else PASS
test_results[trace] = {'expected': expected_result, 'actual': result} test_results[trace] = {'expected': expected_result, 'actual': result}
......
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