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

Unified Diff: telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py

Issue 2162963002: [polymer] Merge of master into polymer10-migration (Closed) Base URL: git@github.com:catapult-project/catapult.git@polymer10-migration
Patch Set: Merge polymer10-migration int polymer10-merge Created 4 years, 5 months 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 | « telemetry/telemetry/value/trace.py ('k') | telemetry/telemetry/web_perf/timeline_based_measurement.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py
diff --git a/telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py b/telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py
index 0aeba9dae4ac2420e44aaaea35a929086b30624f..07bf4fde71953543e7d6fd46bb502e0d729b12b4 100644
--- a/telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py
+++ b/telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py
@@ -111,8 +111,7 @@ class ScrollingPage(page_module.Page):
class SmoothGestureTest(page_test_test_case.PageTestTestCase):
- @decorators.Disabled('mac', # crbug.com/450171
- 'chromeos') # crbug.com/483212
+ @decorators.Disabled('chromeos') # crbug.com/483212
@decorators.Isolated # Needed because of py_trace_event
def testSmoothGestureAdjusted(self):
ps = self.CreateEmptyPageSet()
« no previous file with comments | « telemetry/telemetry/value/trace.py ('k') | telemetry/telemetry/web_perf/timeline_based_measurement.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698