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') |