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

Unified Diff: tools/telemetry/telemetry/page/shared_page_state.py

Issue 1371403004: CL for perf tryjob on mac Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
Index: tools/telemetry/telemetry/page/shared_page_state.py
diff --git a/tools/telemetry/telemetry/page/shared_page_state.py b/tools/telemetry/telemetry/page/shared_page_state.py
index bd879b187c6d087c9c9ca91c8e998596dffbd9d9..e76b1dde8c964f30a93f4521dced49b1edc2cf04 100644
--- a/tools/telemetry/telemetry/page/shared_page_state.py
+++ b/tools/telemetry/telemetry/page/shared_page_state.py
@@ -21,7 +21,7 @@ from telemetry.internal.util import file_handle
from telemetry.page import page_test
from telemetry import story
from telemetry.util import wpr_modes
-from telemetry.web_perf import timeline_based_measurement
+from telemetry.web_perf import story_test
def _PrepareFinderOptions(finder_options, test, device_type):
@@ -45,7 +45,7 @@ class SharedPageState(story.SharedState):
def __init__(self, test, finder_options, story_set):
super(SharedPageState, self).__init__(test, finder_options, story_set)
- if isinstance(test, timeline_based_measurement.TimelineBasedMeasurement):
+ if isinstance(test, story_test.StoryTest):
assert not finder_options.profiler, ('This is a Timeline Based '
'Measurement benchmark. You cannot run it with the --profiler flag. '
'If you need trace data, tracing is always enabled in Timeline Based '
« no previous file with comments | « tools/telemetry/telemetry/benchmark.py ('k') | tools/telemetry/telemetry/web_perf/timeline_based_measurement.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698