Fix a flaky gsubtreed test caused by git2.repo logging

infra/services/gsubtreed/test/gsubtreed_test.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import json
 import logging
 import os
 import sys
 import tempfile
@@ skipping 84 matching lines @@
         success, processed = gsubtreed.inner_loop(local, cref)
     except Exception:  # pragma: no cover
       ret.append(traceback.format_exc().splitlines())
     finally:
       gsubtreed.Pusher.FAKE_THREADING = False
 
       sys.stdout = stdout
       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,
         'processed': processed,
       })
 
   gsubtreed_test_definitions.GSUBTREED_TESTS[test_name](
     origin=origin, run=run, checkpoint=checkpoint, mirrors=mirrors,
     config=cref, local_origin_repo=local)
 
   return expect_tests.Result(ret)
 
 
 @expect_tests.test_generator
 def GenTests():
   for test_name, test in gsubtreed_test_definitions.GSUBTREED_TESTS.iteritems():
     yield expect_tests.Test(
         __package__ + '.' + test_name,
         expect_tests.FuncCall(RunTest, test_name),
         expect_base=test_name, ext='yaml', break_funcs=[test],
         covers=(
             expect_tests.Test.covers_obj(RunTest) +
             expect_tests.Test.covers_obj(gsubtreed_test_definitions)
         ))