Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Unified Diff: tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py

Issue 797003002: Replaced @benchmark.Enabled/Disabled and @test.Enabled/Disabled with @decorators.Enabled/Disabled i… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed some bad imports Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/telemetry/telemetry/unittest_util/test.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py
diff --git a/tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py b/tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py
index c4cf6171efaa0f02f4c7186b8c311a2140c6a316..04325a1e8627fde67e8034693c10a9b47fea9cd6 100644
--- a/tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py
+++ b/tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py
@@ -5,7 +5,7 @@
import os
import unittest
-from telemetry import benchmark
+from telemetry import decorators
from telemetry.core import platform
from telemetry.core import wpr_modes
from telemetry.page import page as page_module
@@ -209,7 +209,7 @@ class TimelineBasedMeasurementTest(page_test_test_case.PageTestTestCase):
# This test is flaky when run in parallel on the mac: crbug.com/426676
# Also, fails on android: crbug.com/437057
- @benchmark.Disabled('android', 'mac')
+ @decorators.Disabled('android', 'mac')
def testSmoothnessTimelineBasedMeasurementForSmoke(self):
ps = self.CreateEmptyPageSet()
ps.AddUserStory(TestTimelinebasedMeasurementPage(
@@ -229,7 +229,7 @@ class TimelineBasedMeasurementTest(page_test_test_case.PageTestTestCase):
# This test is flaky when run in parallel on the mac: crbug.com/426676
# Also, fails on android: crbug.com/437057
- @benchmark.Disabled('android', 'mac')
+ @decorators.Disabled('android', 'mac')
def testFastTimelineBasedMeasurementForSmoke(self):
ps = self.CreateEmptyPageSet()
ps.AddUserStory(TestTimelinebasedMeasurementPage(
@@ -267,7 +267,7 @@ class TimelineBasedMeasurementTest(page_test_test_case.PageTestTestCase):
# Disabled since mainthread_jank metric is not supported on windows platform.
# Also, flaky on the mac when run in parallel: crbug.com/426676
# Also, fails on android: crbug.com/437057
- @benchmark.Disabled('android', 'win', 'mac')
+ @decorators.Disabled('android', 'win', 'mac')
def testMainthreadJankTimelineBasedMeasurement(self):
ps = self.CreateEmptyPageSet()
ps.AddUserStory(TestTimelinebasedMeasurementPage(
« no previous file with comments | « tools/telemetry/telemetry/unittest_util/test.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698