From 3fa393c49877212dba64bb2297a9a6a6d8f1f8cc Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Mon, 15 Apr 2019 16:13:48 -0400 Subject: [PATCH] validate:launcher: Do not copy logs for non flaky tests That looks weird for users and is incorrect --- validate/launcher/baseclasses.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py index 99099fc815..b63cad13f4 100644 --- a/validate/launcher/baseclasses.py +++ b/validate/launcher/baseclasses.py @@ -1975,16 +1975,17 @@ class _TestsLauncher(Loggable): return False if retry_on_failures: - if not self.options.redirect_logs: + if not self.options.redirect_logs and test.allow_flakiness: test.copy_logfiles() printc(test) - test.clean() to_retry.append(test) # Not adding to final report if flakiness is tolerated to_report = not test.allow_flakiness if to_report: self.reporter.after_test(test) + if retry_on_failures: + test.clean() if self.start_new_job(tests_left): jobs_running += 1