[Telemetry] Improve logging on media measurement tests.

tools/perf/metrics/media.py

 # Copyright 2013 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 logging
 import os
 
 from metrics import Metric
 
 
 class MediaMetric(Metric):
   """MediaMetric class injects and calls JS responsible for recording metrics.
 
   Default media metrics are collected for every media element in the page,
   such as decoded_frame_count, dropped_frame_count, decoded_video_bytes, and
   decoded_audio_bytes.
   """
 
   def __init__(self, tab):
     super(MediaMetric, self).__init__()
     with open(os.path.join(os.path.dirname(__file__), 'media.js')) as f:
       js = f.read()
       tab.ExecuteJavaScript(js)
     self._results = None
     self._skip_basic_metrics = False
 
   def Start(self, page, tab):
     """Create the media metrics for all media elements in the document."""
     if hasattr(page.page_set, 'skip_basic_metrics'):
       self._skip_basic_metrics = page.page_set.skip_basic_metrics
+    # Page level attribute overrides page-set one.
+    if hasattr(page, 'skip_basic_metrics'):
+      self._skip_basic_metrics = page.skip_basic_metrics

[dtu, 2013/09/05 19:59:19]

Pages inherit attributes from the page set. So you can just do the page check
only.

[shadi, 2013/09/06 22:22:37]

I wish we knew that earlier :) Thanks!

     tab.ExecuteJavaScript('window.__createMediaMetricsForDocument()')
 
   def Stop(self, page, tab):
     self._results = tab.EvaluateJavaScript('window.__getAllMetrics()')
 
   def AddResults(self, tab, results):
     """Reports all recorded metrics as Telemetry perf results."""
     assert self._results
     for media_metric in self._results:
       self._AddResultsForMediaElement(media_metric, results)
@@ skipping 18 matching lines @@
           special_label = m[len(metric):]
           results.Add(trace + special_label, unit, str(metrics[m]),
                       chart_name=metric, data_type='default')
 
     trace = media_metric['id']
     if not trace:
       logging.error('Metrics ID is missing in results.')
       return
 
     if not self._skip_basic_metrics:
-      AddOneResult('avg_loop_time', 'sec')
       AddOneResult('buffering_time', 'sec')
       AddOneResult('decoded_audio_bytes', 'bytes')
       AddOneResult('decoded_video_bytes', 'bytes')
       AddOneResult('decoded_frame_count', 'frames')
       AddOneResult('dropped_frame_count', 'frames')
       AddOneResult('time_to_play', 'sec')
 
+    AddOneResult('avg_loop_time', 'sec')
     AddOneResult('seek', 'sec')