tools/telemetry/telemetry/page/multi_page_benchmark_runner.py - Issue 12278015: [Telemetry] Reorganize everything.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12278015: [Telemetry] Reorganize everything. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Re-add shebangs. Created 7 years, 10 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 | « tools/telemetry/telemetry/page/multi_page_benchmark.py ('k') | tools/telemetry/telemetry/page/multi_page_benchmark_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/page/multi_page_benchmark_runner.py

diff --git a/tools/telemetry/telemetry/multi_page_benchmark_runner.py b/tools/telemetry/telemetry/page/multi_page_benchmark_runner.py

similarity index 85%

rename from tools/telemetry/telemetry/multi_page_benchmark_runner.py

rename to tools/telemetry/telemetry/page/multi_page_benchmark_runner.py

index e1952dd4b53619cad2655eaefdaaecc9dc29217a..93a6da5905408dba1f0dd63f8acebacfa6eb38d2 100755

--- a/tools/telemetry/telemetry/multi_page_benchmark_runner.py

+++ b/tools/telemetry/telemetry/page/multi_page_benchmark_runner.py

@@ -7,15 +7,15 @@ import logging

import os

import sys

-from telemetry import all_page_actions # pylint: disable=W0611

-from telemetry import block_page_benchmark_results

-from telemetry import browser_finder

-from telemetry import browser_options

-from telemetry import csv_page_benchmark_results

-from telemetry import discover

-from telemetry import multi_page_benchmark

-from telemetry import page_runner

-from telemetry import page_set

+from telemetry.core import browser_finder

+from telemetry.core import browser_options

+from telemetry.page import all_page_actions # pylint: disable=W0611

+from telemetry.page import block_page_benchmark_results

+from telemetry.page import csv_page_benchmark_results

+from telemetry.page import multi_page_benchmark

+from telemetry.page import page_runner

+from telemetry.page import page_set

+from telemetry.test import discover

def Main(benchmark_dir):

"""Turns a MultiPageBenchmark into a command-line program.

@@ -23,7 +23,9 @@ def Main(benchmark_dir):

Args:

benchmark_dir: Path to directory containing MultiPageBenchmarks.

"""

- benchmarks = discover.Discover(benchmark_dir, '',

+ benchmarks = discover.Discover(benchmark_dir,

+ os.path.join(benchmark_dir, '..'),

+ '',

multi_page_benchmark.MultiPageBenchmark)

# Naively find the benchmark. If we use the browser options parser, we run