| Index: tools/telemetry/telemetry/page/multi_page_benchmark_unittest_base.py
|
| diff --git a/tools/telemetry/telemetry/multi_page_benchmark_unittest_base.py b/tools/telemetry/telemetry/page/multi_page_benchmark_unittest_base.py
|
| similarity index 80%
|
| rename from tools/telemetry/telemetry/multi_page_benchmark_unittest_base.py
|
| rename to tools/telemetry/telemetry/page/multi_page_benchmark_unittest_base.py
|
| index eb9d5224c969b0d23127a0e64512660bbfe2c8e2..d281195651d6122d2aa304961d24b02d32f94576 100644
|
| --- a/tools/telemetry/telemetry/multi_page_benchmark_unittest_base.py
|
| +++ b/tools/telemetry/telemetry/page/multi_page_benchmark_unittest_base.py
|
| @@ -4,20 +4,20 @@
|
| import os
|
| import unittest
|
|
|
| -from telemetry import browser_finder
|
| -from telemetry import options_for_unittests
|
| -from telemetry import page_runner
|
| -from telemetry import page as page_module
|
| -from telemetry import page_benchmark_results
|
| -from telemetry import page_set
|
| +from telemetry.core import browser_finder
|
| +from telemetry.page import page_runner
|
| +from telemetry.page import page as page_module
|
| +from telemetry.page import page_benchmark_results
|
| +from telemetry.page import page_set
|
| +from telemetry.test import options_for_unittests
|
|
|
| class MultiPageBenchmarkUnitTestBase(unittest.TestCase):
|
| """unittest.TestCase-derived class to help in the construction of unit tests
|
| for a benchmark."""
|
|
|
| def CreatePageSetFromFileInUnittestDataDir(self, test_filename):
|
| - return self.CreatePageSet('file:///' + os.path.join('..', 'unittest_data',
|
| - test_filename))
|
| + return self.CreatePageSet('file:///' + os.path.join(
|
| + '..', '..', 'unittest_data', test_filename))
|
|
|
| def CreatePageSet(self, test_filename):
|
| base_dir = os.path.dirname(__file__)
|
|
|