tools/telemetry/telemetry/page/multi_page_benchmark_unittest.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_unittest.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_runner.py ('k') | tools/telemetry/telemetry/page/multi_page_benchmark_unittest_base.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

similarity index 91%

rename from tools/telemetry/telemetry/multi_page_benchmark_unittest.py

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

index f70265b13127288de15384eecf1531ffa9b43088..2d50d808152b461e8d185bde110662377c09b43e 100644

--- a/tools/telemetry/telemetry/multi_page_benchmark_unittest.py

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

@@ -4,14 +4,14 @@

import json

import os

-from telemetry import multi_page_benchmark

-from telemetry import multi_page_benchmark_unittest_base

-from telemetry import options_for_unittests

-from telemetry import page as page_module

-from telemetry import page_action

-from telemetry import page_set

-from telemetry import page_set_archive_info

-from telemetry import wpr_modes

+from telemetry.core import wpr_modes

+from telemetry.page import multi_page_benchmark

+from telemetry.page import multi_page_benchmark_unittest_base

+from telemetry.page import page as page_module

+from telemetry.page import page_action

+from telemetry.page import page_set

+from telemetry.page import page_set_archive_info

+from telemetry.test import options_for_unittests

class BenchThatFails(multi_page_benchmark.MultiPageBenchmark):

def MeasurePage(self, page, tab, results):

@@ -63,7 +63,7 @@ class MultiPageBenchmarkUnitTest(

self.assertEquals(0, len(all_results.page_failures))

def testGotQueryParams(self):

- ps = self.CreatePageSet('file:///../unittest_data/blank.html?foo=1')

+ ps = self.CreatePageSet('file:///../../unittest_data/blank.html?foo=1')

benchmark = BenchQueryParams()

ps.pages[-1].query_params = '?foo=1'

all_results = self.RunBenchmark(benchmark, ps, options=self._options)

@@ -135,7 +135,7 @@ class MultiPageBenchmarkUnitTest(

class MockAction(page_action.PageAction):

def RunAction(self, page, tab, previous_action):

action_called[0] = True

- from telemetry import all_page_actions

+ from telemetry.page import all_page_actions

all_page_actions.RegisterClassForTest('mock', MockAction)

ps = self.CreatePageSetFromFileInUnittestDataDir('blank.html')