[Findit] Add two more gtest command line switches.

appengine/findit/waterfall/test/trigger_base_swarming_task_result_pipeline_test.py

 # Copyright 2016 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 time
 
 from model import analysis_status
 from model.flake.flake_swarming_task import FlakeSwarmingTask
 from model.wf_swarming_task import WfSwarmingTask
 from waterfall import swarming_util
@@ skipping 68 matching lines @@
           'priority': 25,
           'properties': {
               'command': 'cmd',
               'dimensions': [{'key': 'k', 'value': 'v'}],
               'env': [
                   {'key': 'a', 'value': '1'},
                   {'key': 'GTEST_SHARD_INDEX', 'value': '1'},
                   {'key': 'GTEST_TOTAL_SHARDS', 'value': '5'},
               ],
               'execution_timeout_secs': 3600,
-              'extra_args': ['--flag=value', '--gtest_filter=d.f'],
+              'extra_args': [
+                  '--flag=value',
+                  '--gtest_filter=d.f',
+                  '--test-launcher-filter-file=path/to/filter/file',
+              ],
               'grace_period_secs': 30,
               'idempotent': True,
               'inputs_ref': {'a': 1},
               'io_timeout_secs': 1200,
           },
           'tags': ['master:a', 'buildername:b', 'name:a_tests'],
           'user': 'user',
       })
     self.mock(swarming_util, 'GetSwarmingTaskRequest',
               MockedGetSwarmingTaskRequest)
@@ skipping 21 matching lines @@
         'parent_task_id': '',
         'priority': 25,
         'properties': {
             'command': 'cmd',
             'dimensions': [{'key': 'k', 'value': 'v'}],
             'env': [
                 {'key': 'a', 'value': '1'},
             ],
             'execution_timeout_secs': 3600,
             'extra_args': [
-                '--flag=value', '--gtest_repeat=10',
+                '--flag=value',
+                '--gtest_filter=a.b:a.c',
+                '--gtest_repeat=10',
                 '--test-launcher-retry-limit=0',
-                '--gtest_filter=a.b:a.c'],
+                '--gtest_also_run_disabled_tests',
+            ],
             'grace_period_secs': 30,
             'idempotent': False,
             'inputs_ref': {'a': 1},
             'io_timeout_secs': 1200,
         },
         'tags': ['purpose:deflake', 'ref_master:%s' % master_name,
                  'ref_buildername:%s' % builder_name,
                  'ref_buildnumber:%s' % build_number,
                  'ref_stepname:%s' % step_name,
                  'ref_task_id:1',
                  'ref_name:a_tests'],
         'user': '',
     }
 
     pipeline = TriggerSwarmingTaskPipeline()
     new_task_id = pipeline.run(
         master_name, builder_name, build_number, step_name, tests)
     self.assertEqual('new_task_id', new_task_id)
     self.assertEqual(expected_new_request_json, new_request_json)
 
     swarming_task = WfSwarmingTask.Get(
         master_name, builder_name, build_number, step_name)
     self.assertIsNotNone(swarming_task)
     self.assertEqual('new_task_id', swarming_task.task_id)
     self.assertEqual(tests, swarming_task.parameters['tests'])
     self.assertEqual(
         waterfall_config.GetSwarmingSettings()['iterations_to_rerun'],
         swarming_task.parameters['iterations_to_rerun'])