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

Unified Diff: tools/android/loading/sandwich_metrics.py

Issue 1872313002: sandwich: Implement SandwichTaskBuilder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addresses pasko's comments Created 4 years, 8 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/android/loading/sandwich_metrics.py
diff --git a/tools/android/loading/sandwich_metrics.py b/tools/android/loading/sandwich_metrics.py
index 98d631733ea4bdaf8bb5e74bcc4f6502a9540e7b..a30b3272af6969bdc7ec3b2ea6f527bff12abe5a 100644
--- a/tools/android/loading/sandwich_metrics.py
+++ b/tools/android/loading/sandwich_metrics.py
@@ -26,13 +26,10 @@ from telemetry.util import image_util
from telemetry.util import rgba_color
import loading_trace as loading_trace_module
+import sandwich_runner
import tracing
-# List of selected trace event categories when running chrome.
-ADDITIONAL_CATEGORIES = (
- 'disabled-by-default-memory-infra',) # Used by _GetBrowserDumpEvents()
-
CSV_FIELD_NAMES = [
'id',
'url',
@@ -140,7 +137,7 @@ def _PullMetricsFromLoadingTrace(loading_trace):
"""
assert all(
cat in loading_trace.tracing_track.Categories()
- for cat in ADDITIONAL_CATEGORIES), (
+ for cat in sandwich_runner.ADDITIONAL_CATEGORIES), (
'This trace was not generated with the required set of categories '
'to be processed by this script.')
browser_dump_events = _GetBrowserDumpEvents(loading_trace.tracing_track)
@@ -245,7 +242,7 @@ def PullMetricsFromOutputDirectory(output_directory_path):
except ValueError:
continue
run_path = os.path.join(output_directory_path, node_name)
- trace_path = os.path.join(run_path, 'trace.json')
+ trace_path = os.path.join(run_path, sandwich_runner.TRACE_FILENAME)
if not os.path.isfile(trace_path):
continue
logging.info('processing \'%s\'' % trace_path)
@@ -254,7 +251,7 @@ def PullMetricsFromOutputDirectory(output_directory_path):
row_metrics.update(_PullMetricsFromLoadingTrace(loading_trace))
row_metrics['id'] = page_id
row_metrics['url'] = loading_trace.url
- video_path = os.path.join(run_path, 'video.mp4')
+ video_path = os.path.join(run_path, sandwich_runner.VIDEO_FILENAME)
if os.path.isfile(video_path):
logging.info('processing \'%s\'' % video_path)
completeness_record = _ExtractCompletenessRecordFromVideo(video_path)

Powered by Google App Engine
This is Rietveld 408576698