[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/story_runner_unittest.py

Index: telemetry/telemetry/internal/story_runner_unittest.py
diff --git a/telemetry/telemetry/internal/story_runner_unittest.py b/telemetry/telemetry/internal/story_runner_unittest.py
index 414f3f3997e1926965bd55ebea015de8d348280b..94d5705c5c9a38416f2979c59e0800a05217a985 100644
--- a/telemetry/telemetry/internal/story_runner_unittest.py
+++ b/telemetry/telemetry/internal/story_runner_unittest.py
@@ -363,7 +363,7 @@ class StoryRunnerTest(unittest.TestCase):
     calls_in_order = GetCallsInOrder() # pylint: disable=no-value-for-parameter
     self.assertEquals(EXPECTED_CALLS_IN_ORDER, calls_in_order)
 
-  def testTearDownStateAfterEachStoryRun(self):
+  def testTearDownStateAfterEachStoryOrStorySetRun(self):
     class TestSharedStateForTearDown(TestSharedState):
       num_of_tear_downs = 0
 
@@ -384,9 +384,15 @@ class StoryRunnerTest(unittest.TestCase):
 
     TestSharedStateForTearDown.num_of_tear_downs = 0
     story_runner.Run(mock.MagicMock(), story_set, self.options, self.results,
-                     should_tear_down_state_after_each_story_run=True)
+                     tear_down_after_story=True)
     self.assertEquals(TestSharedStateForTearDown.num_of_tear_downs, 3)
 
+    self.options.pageset_repeat = 5
+    TestSharedStateForTearDown.num_of_tear_downs = 0
+    story_runner.Run(mock.MagicMock(), story_set, self.options, self.results,
+                     tear_down_after_story_set=True)
+    self.assertEquals(TestSharedStateForTearDown.num_of_tear_downs, 5)
+
   def testTearDownIsCalledOnceForEachStoryGroupWithPageSetRepeat(self):
     self.options.pageset_repeat = 3
     fooz_init_call_counter = [0]