[Telemetry] Add Benchmark.ShouldTearDownStateAfterEachStorySetRun

telemetry/telemetry/benchmark_unittest.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 optparse
 import unittest
 
 from telemetry import android
 from telemetry import benchmark
 from telemetry.testing import options_for_unittests
@@ skipping 120 matching lines @@
   def testBenchmarkPredicate(self):
     class PredicateBenchmark(TestBenchmark):
       @classmethod
       def ValueCanBeAddedPredicate(cls, value, is_first_result):
         return False
 
     original_run_fn = story_runner.Run
     validPredicate = [False]
 
     def RunStub(test, story_set_module, finder_options, results,
-                *args): # pylint: disable=unused-argument
+                *args, **kwargs): # pylint: disable=unused-argument
       predicate = results._value_can_be_added_predicate
       valid = predicate == PredicateBenchmark.ValueCanBeAddedPredicate
       validPredicate[0] = valid
 
     story_runner.Run = RunStub
 
     try:
       options = options_for_unittests.GetCopy()
       options.output_formats = ['none']
       options.suppress_gtest_report = True
       parser = optparse.OptionParser()
       benchmark.AddCommandLineArgs(parser)
       options.MergeDefaultValues(parser.get_default_values())
 
       b = PredicateBenchmark(page.Page(url='about:blank'))
       b.Run(options)
     finally:
       story_runner.Run = original_run_fn
 
     self.assertTrue(validPredicate[0])