Reland "Switch telemetry over to use typ to run the unit tests."

tools/telemetry/telemetry/web_perf/timeline_based_measurement_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 os
 import unittest
 
 from telemetry import benchmark
 from telemetry.core import platform
 from telemetry.core import wpr_modes
 from telemetry.page import page as page_module
 from telemetry.page import page_set
 from telemetry.results import page_test_results
 from telemetry.timeline import model as model_module
 from telemetry.timeline import async_slice
 from telemetry.unittest import options_for_unittests
 from telemetry.unittest import page_test_test_case
+from telemetry.unittest import browser_test_case
 from telemetry.value import scalar
 from telemetry.web_perf import timeline_based_measurement as tbm_module
 from telemetry.web_perf import timeline_interaction_record as tir_module
 from telemetry.web_perf.metrics import timeline_based_metric
 
 
 class FakeFastMetric(timeline_based_metric.TimelineBasedMetric):
 
   def AddResults(self, model, renderer_thread, interaction_records, results):
     results.AddValue(scalar.ScalarValue(
@@ skipping 166 matching lines @@
       action_runner.TapElement('#jank-button')
       action_runner.WaitForJavaScriptCondition('window.jankScriptDone')
     if self._trigger_slow:
       action_runner.TapElement('#slow-button')
       action_runner.WaitForJavaScriptCondition('window.slowScriptDone')
 
 
 class TimelineBasedMeasurementTest(page_test_test_case.PageTestTestCase):
 
   def setUp(self):
+    browser_test_case.teardown_browser()
     self._options = options_for_unittests.GetCopy()
     self._options.browser_options.wpr_mode = wpr_modes.WPR_OFF
 
+  # This test is flaky when run in parallel on the mac: crbug.com/426676
+  @benchmark.Disabled('mac')
   def testSmoothnessTimelineBasedMeasurementForSmoke(self):
     ps = self.CreateEmptyPageSet()
     ps.AddPage(TestTimelinebasedMeasurementPage(
         ps, ps.base_dir, trigger_animation=True))
 
     measurement = tbm_module.TimelineBasedMeasurement()
     results = self.RunMeasurement(measurement, ps,
                                   options=self._options)
 
     self.assertEquals(0, len(results.failures))
     v = results.FindAllPageSpecificValuesNamed(
         'CenterAnimation-frame_time_discrepancy')
     self.assertEquals(len(v), 1)
     v = results.FindAllPageSpecificValuesNamed(
         'DrawerAnimation-frame_time_discrepancy')
     self.assertEquals(len(v), 1)
 
+  # This test is flaky when run in parallel on the mac: crbug.com/426676
+  @benchmark.Disabled('mac')
   def testFastTimelineBasedMeasurementForSmoke(self):
     ps = self.CreateEmptyPageSet()
     ps.AddPage(TestTimelinebasedMeasurementPage(
         ps, ps.base_dir, trigger_slow=True))
 
     measurement = tbm_module.TimelineBasedMeasurement()
     results = self.RunMeasurement(measurement, ps, options=self._options)
 
     self.assertEquals([], results.failures)
     expected_names = set([
@@ skipping 15 matching lines @@
     self.assertEquals(
         expected_names, set(v.name for v in results.all_page_specific_values))
 
     # In interaction_enabled_page.html, the "slow" interaction executes
     # a loop with window.performance.now() to wait 200ms.
     # fast-duration measures wall time so its value should be at least 200ms.
     v = results.FindAllPageSpecificValuesNamed('SlowThreadJsRun-fast-duration')
     self.assertGreaterEqual(v[0].value, 200.0)
 
   # Disabled since mainthread_jank metric is not supported on windows platform.
-  @benchmark.Disabled('win')
+  # Also, flaky on the mac when run in parallel: crbug.com/426676
+  @benchmark.Disabled('win', 'mac')
   def testMainthreadJankTimelineBasedMeasurement(self):
     ps = self.CreateEmptyPageSet()
     ps.AddPage(TestTimelinebasedMeasurementPage(
         ps, ps.base_dir, trigger_jank=True))
 
     measurement = tbm_module.TimelineBasedMeasurement()
     results = self.RunMeasurement(measurement, ps,
                                   options=self._options)
     self.assertEquals(0, len(results.failures))
 
     # In interaction_enabled_page.html, we create a jank loop based on
     # window.performance.now() (basically loop for x milliseconds).
     # Since window.performance.now() uses wall-time instead of thread time,
     # we only assert the biggest jank > 50ms here to account for the fact
     # that the browser may deschedule during the jank loop.
     v = results.FindAllPageSpecificValuesNamed(
         'JankThreadJSRun-responsive-biggest_jank_thread_time')
     self.assertGreaterEqual(v[0].value, 50)
 
     v = results.FindAllPageSpecificValuesNamed(
         'JankThreadJSRun-responsive-total_big_jank_thread_time')
     self.assertGreaterEqual(v[0].value, 50)