Don't duplicate gtest-parallel flags in gtest-parallel-wrappers.

tools-webrtc/mb/mb_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 """Tests for mb.py."""
@@ skipping 430 matching lines @@
 
     self.assertEqual(files, [
         '../../testing/test_env.py',
         '../../third_party/gtest-parallel/gtest-parallel',
         '../../tools-webrtc/gtest-parallel-wrapper.py',
         'base_unittests',
     ])
     self.assertEqual(command, [
         '../../testing/test_env.py',
         '../../tools-webrtc/gtest-parallel-wrapper.py',
+        '--output_dir=${ISOLATED_OUTDIR}/test_logs',
         '--gtest_color=no',
-        '--output_dir=${ISOLATED_OUTDIR}/test_logs',
+        '--timeout=900',
         './base_unittests',
         '--workers=1',
         '--',
         '--asan=0',
         '--msan=0',
         '--tsan=0',
     ])
 
   def test_gn_isolate_windowed_test_launcher_linux(self):
     test_files = {
@@ skipping 24 matching lines @@
         '../../testing/test_env.py',
         '../../testing/xvfb.py',
         '../../third_party/gtest-parallel/gtest-parallel',
         '../../tools-webrtc/gtest-parallel-wrapper.py',
         'base_unittests',
         'some_resource_file',
     ])
     self.assertEqual(command, [
         '../../testing/xvfb.py',
         '../../tools-webrtc/gtest-parallel-wrapper.py',
+        '--output_dir=${ISOLATED_OUTDIR}/test_logs',
         '--gtest_color=no',
-        '--output_dir=${ISOLATED_OUTDIR}/test_logs',
+        '--timeout=900',
         './base_unittests',
         '--',
         '--asan=0',
         '--msan=0',
         '--tsan=0',
     ])
 
   def test_gn_gen_windowed_test_launcher_win(self):
     files = {
       '/tmp/swarming_targets': 'unittests\n',
@@ skipping 24 matching lines @@
     self.assertEqual(files, [
         '../../testing/test_env.py',
         '../../third_party/gtest-parallel/gtest-parallel',
         '../../tools-webrtc/gtest-parallel-wrapper.py',
         'some_dependency',
         'unittests.exe',
     ])
     self.assertEqual(command, [
         '../../testing/test_env.py',
         '../../tools-webrtc/gtest-parallel-wrapper.py',
+        '--output_dir=${ISOLATED_OUTDIR}\\test_logs',
         '--gtest_color=no',
-        '--output_dir=${ISOLATED_OUTDIR}\\test_logs',
+        '--timeout=900',
         r'.\unittests.exe',
         '--',
         '--asan=0',
         '--msan=0',
         '--tsan=0',
     ])
 
   def test_gn_gen_console_test_launcher(self):
     test_files = {
       '/tmp/swarming_targets': 'base_unittests\n',
@@ skipping 20 matching lines @@
 
     self.assertEqual(files, [
         '../../testing/test_env.py',
         '../../third_party/gtest-parallel/gtest-parallel',
         '../../tools-webrtc/gtest-parallel-wrapper.py',
         'base_unittests',
     ])
     self.assertEqual(command, [
         '../../testing/test_env.py',
         '../../tools-webrtc/gtest-parallel-wrapper.py',
+        '--output_dir=${ISOLATED_OUTDIR}/test_logs',
         '--gtest_color=no',
-        '--output_dir=${ISOLATED_OUTDIR}/test_logs',
+        '--timeout=900',
         './base_unittests',
         '--',
         '--asan=0',
         '--msan=0',
         '--tsan=0',
     ])
 
   def test_gn_isolate_console_test_launcher_memcheck(self):
     test_files = {
       '/tmp/swarming_targets': 'base_unittests\n',
@@ skipping 174 matching lines @@
     self.check(['lookup', '-c', 'fake_config'], mbw=mbw,
                ret=0,
                out=("GYP_DEFINES='foo=bar baz=1'\n"
                     "GYP_LINK_CONCURRENCY=1\n"
                     "LLVM_FORCE_HEAD_REVISION=1\n"
                     "python build/gyp_chromium -G output_dir=_path_\n"))
 
 
 if __name__ == '__main__':
   unittest.main()