[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/story_runner_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 math
 import os
 import StringIO
 import sys
 import unittest
 
@@ skipping 345 matching lines @@
 
       test = TestStoryTest()
       story_set = story_module.StorySet()
       story_set.AddStory(DummyLocalStory(TestSharedStateForStoryTest))
       story_runner.Run(test, story_set, self.options, self.results)
       return [call[0] for call in manager.mock_calls]
 
     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
 
       def RunStory(self, results):
         pass
 
       def TearDownState(self):
         TestSharedStateForTearDown.num_of_tear_downs += 1
 
     story_set = story_module.StorySet()
     story_set.AddStory(DummyLocalStory(TestSharedStateForTearDown))
     story_set.AddStory(DummyLocalStory(TestSharedStateForTearDown))
     story_set.AddStory(DummyLocalStory(TestSharedStateForTearDown))
 
     TestSharedStateForTearDown.num_of_tear_downs = 0
     story_runner.Run(mock.MagicMock(), story_set, self.options, self.results)
     self.assertEquals(TestSharedStateForTearDown.num_of_tear_downs, 1)
 
     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]
     fooz_tear_down_call_counter = [0]
     barz_init_call_counter = [0]
     barz_tear_down_call_counter = [0]
     class FoozStoryState(FooStoryState):
       def __init__(self, test, options, storyz):
         super(FoozStoryState, self).__init__(
           test, options, storyz)
@@ skipping 582 matching lines @@
       mock.call.test.WillRunStory(root_mock.state.platform),
       mock.call.state.WillRunStory(root_mock.story),
       mock.call.state.CanRunStory(root_mock.story),
       mock.call.state.RunStory(root_mock.results),
       mock.call.test.Measure(root_mock.state.platform, root_mock.results),
       mock.call.state.DumpStateUponFailure(root_mock.story, root_mock.results),
       mock.call.results.AddValue(FailureValueMatcher('foo')),
       mock.call.state.DidRunStory(root_mock.results),
       mock.call.test.DidRunStory(root_mock.state.platform)
     ])