Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(742)

Unified Diff: infra/services/gsubtreed/test/gsubtreed_test.py

Issue 1325753006: Fix a flaky gsubtreed test caused by git2.repo logging (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: infra/services/gsubtreed/test/gsubtreed_test.py
diff --git a/infra/services/gsubtreed/test/gsubtreed_test.py b/infra/services/gsubtreed/test/gsubtreed_test.py
index c65120fe697d57ac815a9e3001a759f0f02e81f7..b994eec8ecd843aa16a0aa8b00cd75e6ccc346ad 100644
--- a/infra/services/gsubtreed/test/gsubtreed_test.py
+++ b/infra/services/gsubtreed/test/gsubtreed_test.py
@@ -102,7 +102,12 @@ def RunTest(test_name):
sys.stderr = stderr
root_logger.removeHandler(shandler)
- ret.append({'log output': logout.getvalue().splitlines()})
+
+ # infra.libs.git2.repo logs this message if the command took longer than
+ # 1s to run. This causes test flakes occasionally.
+ log_lines = [x for x in logout.getvalue().splitlines()
+ if 'Finished in ' not in x]
+ ret.append({'log output': log_lines})
ret.append({
'inner_loop success': success,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698