[Telemetry] Add 'name' attribute for pages, which allows for more human-readable printing

tools/telemetry/telemetry/page/buildbot_page_measurement_results_unittest.py

 # Copyright (c) 2012 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 os
 import unittest
 
 from telemetry.page import buildbot_page_measurement_results
 from telemetry.page import page_set
 from telemetry.page import perf_tests_helper
 
@@ skipping 25 matching lines @@
     measurement_results = SummarySavingPageMeasurementResults()
     measurement_results.WillMeasurePage(test_page_set.pages[0])
     measurement_results.Add('a', 'seconds', 3)
     measurement_results.DidMeasurePage()
 
     measurement_results.WillMeasurePage(test_page_set.pages[1])
     measurement_results.Add('a', 'seconds', 7)
     measurement_results.DidMeasurePage()
 
     measurement_results.PrintSummary()
-    expected = ['RESULT a_by_url: http___www.foo.com_= 3 seconds',
-                'RESULT a_by_url: http___www.bar.com_= 7 seconds',
+    expected = ['RESULT a_by_name: http___www.foo.com_= 3 seconds',

[tonyg, 2013/09/06 04:32:24]

Sorry I missed this before, but the dashboard had special handling for the
_by_url results.

We should either revert these back to _by_url or update the dashboard to treat
_by_name like it used to treat _by_url.

I'll leave it up to you and Annie to decide which is better.

+                'RESULT a_by_name: http___www.bar.com_= 7 seconds',
                 '*RESULT a: a= [3,7] seconds\nAvg a: 5.000000seconds\n' +
                 'Sd  a: 2.828427seconds']
     self.assertEquals(measurement_results.results, expected)
 
   def test_basic_summary_nonuniform_results(self):
     test_page_set = _MakePageSet()
 
     measurement_results = SummarySavingPageMeasurementResults()
     measurement_results.WillMeasurePage(test_page_set.pages[0])
     measurement_results.Add('a', 'seconds', 3)
     measurement_results.Add('b', 'seconds', 10)
     measurement_results.DidMeasurePage()
 
     measurement_results.WillMeasurePage(test_page_set.pages[1])
     measurement_results.Add('a', 'seconds', 3)
     measurement_results.Add('b', 'seconds', 10)
     measurement_results.DidMeasurePage()
 
     measurement_results.WillMeasurePage(test_page_set.pages[2])
     measurement_results.Add('a', 'seconds', 7)
     # Note, page[2] does not report a 'b' metric.
     measurement_results.DidMeasurePage()
 
     measurement_results.PrintSummary()
-    expected = ['RESULT a_by_url: http___www.foo.com_= 3 seconds',
-                'RESULT a_by_url: http___www.bar.com_= 3 seconds',
-                'RESULT a_by_url: http___www.baz.com_= 7 seconds',
+    expected = ['RESULT a_by_name: http___www.foo.com_= 3 seconds',
+                'RESULT a_by_name: http___www.bar.com_= 3 seconds',
+                'RESULT a_by_name: http___www.baz.com_= 7 seconds',
                 '*RESULT a: a= [3,3,7] seconds\nAvg a: 4.333333seconds\n' +
                     'Sd  a: 2.309401seconds',
-                'RESULT b_by_url: http___www.foo.com_= 10 seconds',
-                'RESULT b_by_url: http___www.bar.com_= 10 seconds',
+                'RESULT b_by_name: http___www.foo.com_= 10 seconds',
+                'RESULT b_by_name: http___www.bar.com_= 10 seconds',
                 '*RESULT b: b= [10,10] seconds\nAvg b: 10.000000seconds']
     self.assertEquals(measurement_results.results, expected)
 
   def test_basic_summary_pass_and_fail_page(self):
     """If a page failed, only print summary for individual passing pages."""
     test_page_set = _MakePageSet()
 
     measurement_results = SummarySavingPageMeasurementResults()
     measurement_results.WillMeasurePage(test_page_set.pages[0])
     measurement_results.Add('a', 'seconds', 3)
     measurement_results.DidMeasurePage()
     measurement_results.AddFailureMessage(test_page_set.pages[0], 'message')
 
     measurement_results.WillMeasurePage(test_page_set.pages[1])
     measurement_results.Add('a', 'seconds', 7)
     measurement_results.DidMeasurePage()
 
     measurement_results.PrintSummary()
-    expected = ['RESULT a_by_url: http___www.bar.com_= 7 seconds']
+    expected = ['RESULT a_by_name: http___www.bar.com_= 7 seconds']
     self.assertEquals(measurement_results.results, expected)
 
   def test_repeated_pageset_one_iteration_one_page_fails(self):
     """Page fails on one iteration, no results for that page should print."""
     test_page_set = _MakePageSet()
 
     measurement_results = SummarySavingPageMeasurementResults()
     measurement_results.WillMeasurePage(test_page_set.pages[0])
     measurement_results.Add('a', 'seconds', 3)
     measurement_results.DidMeasurePage()
 
     measurement_results.WillMeasurePage(test_page_set.pages[1])
     measurement_results.Add('a', 'seconds', 7)
     measurement_results.DidMeasurePage()
     measurement_results.AddFailureMessage(test_page_set.pages[1], 'message')
 
     measurement_results.WillMeasurePage(test_page_set.pages[0])
     measurement_results.Add('a', 'seconds', 4)
     measurement_results.DidMeasurePage()
 
     measurement_results.WillMeasurePage(test_page_set.pages[1])
     measurement_results.Add('a', 'seconds', 8)
     measurement_results.DidMeasurePage()
 
     measurement_results.PrintSummary()
-    expected = ['RESULT a_by_url: http___www.foo.com_= [3,4] seconds\n' +
-                'Avg a_by_url: 3.500000seconds\nSd  a_by_url: 0.707107seconds']
+    expected = ['RESULT a_by_name: http___www.foo.com_= [3,4] seconds\n' +
+                'Avg a_by_name: 3.500000seconds\n' +
+                'Sd  a_by_name: 0.707107seconds']
     self.assertEquals(measurement_results.results, expected)
 
   def test_repeated_pageset(self):
     test_page_set = _MakePageSet()
 
     measurement_results = SummarySavingPageMeasurementResults()
     measurement_results.WillMeasurePage(test_page_set.pages[0])
     measurement_results.Add('a', 'seconds', 3)
     measurement_results.DidMeasurePage()
 
     measurement_results.WillMeasurePage(test_page_set.pages[1])
     measurement_results.Add('a', 'seconds', 7)
     measurement_results.DidMeasurePage()
 
     measurement_results.WillMeasurePage(test_page_set.pages[0])
     measurement_results.Add('a', 'seconds', 4)
     measurement_results.DidMeasurePage()
 
     measurement_results.WillMeasurePage(test_page_set.pages[1])
     measurement_results.Add('a', 'seconds', 8)
     measurement_results.DidMeasurePage()
 
     measurement_results.PrintSummary()
-    expected = ['RESULT a_by_url: http___www.foo.com_= [3,4] seconds\n' +
-                'Avg a_by_url: 3.500000seconds\nSd  a_by_url: 0.707107seconds',
-                'RESULT a_by_url: http___www.bar.com_= [7,8] seconds\n' +
-                'Avg a_by_url: 7.500000seconds\nSd  a_by_url: 0.707107seconds',
+    expected = ['RESULT a_by_name: http___www.foo.com_= [3,4] seconds\n' +
+                'Avg a_by_name: 3.500000seconds\n' +
+                'Sd  a_by_name: 0.707107seconds',
+                'RESULT a_by_name: http___www.bar.com_= [7,8] seconds\n' +
+                'Avg a_by_name: 7.500000seconds\n' +
+                'Sd  a_by_name: 0.707107seconds',
                 '*RESULT a: a= [3,7,4,8] seconds\n' +
-                'Avg a: 5.500000seconds\nSd  a: 2.380476seconds'
+                'Avg a: 5.500000seconds\n'
+                'Sd  a: 2.380476seconds'
                 ]
     self.assertEquals(
       measurement_results.results,
       expected)
 
   def test_repeated_pages(self):
     test_page_set = _MakePageSet()
 
     measurement_results = SummarySavingPageMeasurementResults()
     measurement_results.WillMeasurePage(test_page_set.pages[0])
     measurement_results.Add('a', 'seconds', 3)
     measurement_results.DidMeasurePage()
 
     measurement_results.WillMeasurePage(test_page_set.pages[0])
     measurement_results.Add('a', 'seconds', 4)
     measurement_results.DidMeasurePage()
 
     measurement_results.WillMeasurePage(test_page_set.pages[1])
     measurement_results.Add('a', 'seconds', 7)
     measurement_results.DidMeasurePage()
 
     measurement_results.WillMeasurePage(test_page_set.pages[1])
     measurement_results.Add('a', 'seconds', 8)
     measurement_results.DidMeasurePage()
 
     measurement_results.PrintSummary()
-    expected = ['RESULT a_by_url: http___www.foo.com_= [3,4] seconds\n' +
-                'Avg a_by_url: 3.500000seconds\nSd  a_by_url: 0.707107seconds',
-                'RESULT a_by_url: http___www.bar.com_= [7,8] seconds\n' +
-                'Avg a_by_url: 7.500000seconds\nSd  a_by_url: 0.707107seconds',
+    expected = ['RESULT a_by_name: http___www.foo.com_= [3,4] seconds\n' +
+                'Avg a_by_name: 3.500000seconds\n' +
+                'Sd  a_by_name: 0.707107seconds',
+                'RESULT a_by_name: http___www.bar.com_= [7,8] seconds\n' +
+                'Avg a_by_name: 7.500000seconds\n' +
+                'Sd  a_by_name: 0.707107seconds',
                 '*RESULT a: a= [3,4,7,8] seconds\n' +
-                'Avg a: 5.500000seconds\nSd  a: 2.380476seconds'
+                'Avg a: 5.500000seconds\n' +
+                'Sd  a: 2.380476seconds'
                 ]
     self.assertEquals(
       measurement_results.results,
       expected)
 
   def test_overall_results(self):
     test_page_set = _MakePageSet()
 
     measurement_results = SummarySavingPageMeasurementResults()
 
     measurement_results.AddSummary('a', 'seconds', 1)
 
     measurement_results.WillMeasurePage(test_page_set.pages[0])
     measurement_results.Add('b', 'seconds', 2)
     measurement_results.DidMeasurePage()
 
     measurement_results.WillMeasurePage(test_page_set.pages[1])
     measurement_results.Add('b', 'seconds', 3)
     measurement_results.DidMeasurePage()
 
     measurement_results.AddSummary('c', 'seconds', 4)
 
     measurement_results.PrintSummary()
 
     self.assertEquals(
         measurement_results.results,
-        ['RESULT b_by_url: http___www.foo.com_= 2 seconds',
-         'RESULT b_by_url: http___www.bar.com_= 3 seconds',
+        ['RESULT b_by_name: http___www.foo.com_= 2 seconds',
+         'RESULT b_by_name: http___www.bar.com_= 3 seconds',
          '*RESULT b: b= [2,3] seconds\n' +
          'Avg b: 2.500000seconds\nSd  b: 0.707107seconds',
          '*RESULT a: a= 1 seconds',
          '*RESULT c: c= 4 seconds'])
 
   def test_overall_results_trace_tag(self):
     test_page_set = _MakePageSet()
 
     measurement_results = SummarySavingPageMeasurementResults(trace_tag='_ref')
 
@@ skipping 30 matching lines @@
 
     measurement_results.WillMeasurePage(test_page_set.pages[1])
     measurement_results.Add('a', '',
                           '{"buckets": [{"low": 2, "high": 3, "count": 1}]}',
                           data_type='histogram')
     measurement_results.DidMeasurePage()
 
     measurement_results.PrintSummary()
 
     expected = [
-        'HISTOGRAM a_by_url: http___www.foo.com_= ' +
+        'HISTOGRAM a_by_name: http___www.foo.com_= ' +
         '{"buckets": [{"low": 1, "high": 2, "count": 1}]}\n' +
-        'Avg a_by_url: 1.500000',
-        'HISTOGRAM a_by_url: http___www.bar.com_= ' +
+        'Avg a_by_name: 1.500000',
+        'HISTOGRAM a_by_name: http___www.bar.com_= ' +
         '{"buckets": [{"low": 2, "high": 3, "count": 1}]}\n' +
-        'Avg a_by_url: 2.500000']
+        'Avg a_by_name: 2.500000']
     self.assertEquals(measurement_results.results, expected)