| Index: tools/telemetry/telemetry/internal/story_runner_unittest.py
|
| diff --git a/tools/telemetry/telemetry/internal/story_runner_unittest.py b/tools/telemetry/telemetry/internal/story_runner_unittest.py
|
| index 3a33782e1dce3de8378bce8e75f1ac2ef6932f93..390aeb56b82ed9083d84570c9c71a34ba68d3a90 100644
|
| --- a/tools/telemetry/telemetry/internal/story_runner_unittest.py
|
| +++ b/tools/telemetry/telemetry/internal/story_runner_unittest.py
|
| @@ -21,7 +21,9 @@ from telemetry.unittest_util import system_stub
|
| from telemetry import user_story as user_story_module
|
| from telemetry.util import cloud_storage
|
| from telemetry.util import exception_formatter as exception_formatter_module
|
| +from telemetry.value import list_of_scalar_values
|
| from telemetry.value import scalar
|
| +from telemetry.value import summary as summary_module
|
| from telemetry.web_perf import timeline_based_measurement
|
| from telemetry.wpr import archive_info
|
|
|
| @@ -403,10 +405,12 @@ class StoryRunnerTest(unittest.TestCase):
|
|
|
| def testPagesetRepeat(self):
|
| story_set = story.StorySet()
|
| - story_set.AddUserStory(
|
| - DummyLocalUserStory(TestSharedPageState, name='blank'))
|
| - story_set.AddUserStory(
|
| - DummyLocalUserStory(TestSharedPageState, name='green'))
|
| +
|
| + # TODO(eakuefner): Factor this out after flattening page ref in Value
|
| + blank_story = DummyLocalUserStory(TestSharedPageState, name='blank')
|
| + green_story = DummyLocalUserStory(TestSharedPageState, name='green')
|
| + story_set.AddUserStory(blank_story)
|
| + story_set.AddUserStory(green_story)
|
|
|
| class Measurement(page_test.PageTest):
|
| i = 0
|
| @@ -420,18 +424,27 @@ class StoryRunnerTest(unittest.TestCase):
|
|
|
| self.options.page_repeat = 1
|
| self.options.pageset_repeat = 2
|
| - self.options.output_formats = ['buildbot']
|
| + self.options.output_formats = []
|
| results = results_options.CreateResults(
|
| EmptyMetadataForTest(), self.options)
|
| story_runner.Run(
|
| Measurement(), story_set, self.expectations, self.options, results)
|
| - results.PrintSummary()
|
| - contents = self.fake_stdout.getvalue()
|
| + summary = summary_module.Summary(results.all_page_specific_values)
|
| + values = summary.interleaved_computed_per_page_values_and_summaries
|
| +
|
| + blank_value = list_of_scalar_values.ListOfScalarValues(
|
| + blank_story, 'metric', 'unit', [1, 3])
|
| + green_value = list_of_scalar_values.ListOfScalarValues(
|
| + green_story, 'metric', 'unit', [2, 4])
|
| + merged_value = list_of_scalar_values.ListOfScalarValues(
|
| + None, 'metric', 'unit', [1, 2, 3, 4])
|
| +
|
| self.assertEquals(4, GetNumberOfSuccessfulPageRuns(results))
|
| self.assertEquals(0, len(results.failures))
|
| - self.assertIn('RESULT metric: blank= [1,3] unit', contents)
|
| - self.assertIn('RESULT metric: green= [2,4] unit', contents)
|
| - self.assertIn('*RESULT metric: metric= [1,2,3,4] unit', contents)
|
| + self.assertEquals(3, len(values))
|
| + self.assertIn(blank_value, values)
|
| + self.assertIn(green_value, values)
|
| + self.assertIn(merged_value, values)
|
|
|
| @decorators.Disabled('chromeos') # crbug.com/483212
|
| def testUpdateAndCheckArchives(self):
|
|
|