Revert of [Telemetry] Ensure that story display names are unique

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 8d0291a26f4b936897cd7d0bdbc39591a55cc5b7..94d5705c5c9a38416f2979c59e0800a05217a985 100644
--- a/telemetry/telemetry/internal/story_runner_unittest.py
+++ b/telemetry/telemetry/internal/story_runner_unittest.py
@@ -134,9 +134,8 @@
     story_set = MixedStateStorySet()
   else:
     story_set = story_module.StorySet()
-  for i, story_state in enumerate(story_state_list):
-    story_set.AddStory(DummyLocalStory(story_state,
-                                       name='story%d' % i))
+  for story_state in story_state_list:
+    story_set.AddStory(DummyLocalStory(story_state))
   return story_set
 
 def _GetOptionForUnittest():
@@ -297,9 +296,9 @@
     manager.attach_mock(test.DidRunStory, TEST_DID_RUN_STORY)
 
     story_set = story_module.StorySet()
-    story_set.AddStory(DummyLocalStory(TestSharedTbmState, name='foo'))
-    story_set.AddStory(DummyLocalStory(TestSharedTbmState, name='bar'))
-    story_set.AddStory(DummyLocalStory(TestSharedTbmState, name='baz'))
+    story_set.AddStory(DummyLocalStory(TestSharedTbmState))
+    story_set.AddStory(DummyLocalStory(TestSharedTbmState))
+    story_set.AddStory(DummyLocalStory(TestSharedTbmState))
     story_runner.Run(
         test, story_set, self.options, self.results)
     self.assertEquals(0, len(self.results.failures))
@@ -375,9 +374,9 @@
         TestSharedStateForTearDown.num_of_tear_downs += 1
 
     story_set = story_module.StorySet()
-    story_set.AddStory(DummyLocalStory(TestSharedStateForTearDown, name='foo'))
-    story_set.AddStory(DummyLocalStory(TestSharedStateForTearDown, name='bar'))
-    story_set.AddStory(DummyLocalStory(TestSharedStateForTearDown, name='baz'))
+    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)
@@ -490,8 +489,8 @@
       def ValidateAndMeasurePage(self, page, tab, results):
         pass
 
-    s1 = DummyLocalStory(TestSharedPageState, name='foo')
-    s2 = DummyLocalStory(TestSharedPageState, name='bar')
+    s1 = DummyLocalStory(TestSharedPageState)
+    s2 = DummyLocalStory(TestSharedPageState)
     story_set.AddStory(s1)
     story_set.AddStory(s2)
     test = Test()
@@ -521,8 +520,8 @@
       def ValidateAndMeasurePage(self, page, tab, results):
         pass
 
-    story_set.AddStory(DummyLocalStory(TestSharedPageState, name='foo'))
-    story_set.AddStory(DummyLocalStory(TestSharedPageState, name='bar'))
+    story_set.AddStory(DummyLocalStory(TestSharedPageState))
+    story_set.AddStory(DummyLocalStory(TestSharedPageState))
     test = Test()
     story_runner.Run(
         test, story_set, self.options, self.results)
@@ -562,8 +561,8 @@
       def ValidateAndMeasurePage(self, page, tab, results):
         pass
 
-    story_set.AddStory(DummyLocalStory(TestTearDownSharedState, name='foo'))
-    story_set.AddStory(DummyLocalStory(TestTearDownSharedState, name='bar'))
+    story_set.AddStory(DummyLocalStory(TestTearDownSharedState))
+    story_set.AddStory(DummyLocalStory(TestTearDownSharedState))
     test = Test()
 
     with self.assertRaises(DidRunTestError):
@@ -723,10 +722,10 @@
         pass
 
     class FailingStory(story_module.Story):
-      def __init__(self, name):
+      def __init__(self):
         super(FailingStory, self).__init__(
             shared_state_class=SimpleSharedState,
-            is_local=True, name=name)
+            is_local=True)
         self.was_run = False
 
       def Run(self, shared_state):
@@ -740,8 +739,8 @@
     self.SuppressExceptionFormatting()
 
     story_set = story_module.StorySet()
-    for i in range(num_failing_stories):
-      story_set.AddStory(FailingStory(name='failing%d' % i))
+    for _ in range(num_failing_stories):
+      story_set.AddStory(FailingStory())
 
     options = _GetOptionForUnittest()
     options.output_formats = ['none']