diff options
| author | nednguyen <nednguyen@google.com> | 2014-11-12 16:15:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-13 00:16:04 +0000 |
| commit | 1ad14348963665d58bc65c8c327e00c8c11da0c9 (patch) | |
| tree | aa5b65d3456e477641afd20d992864e516f27832 /content | |
| parent | 438740dae5d7f74feabf8c5ffd29a6194eee43dd (diff) | |
| download | chromium_src-1ad14348963665d58bc65c8c327e00c8c11da0c9.zip chromium_src-1ad14348963665d58bc65c8c327e00c8c11da0c9.tar.gz chromium_src-1ad14348963665d58bc65c8c327e00c8c11da0c9.tar.bz2 | |
[Telemetry] Rename telemetry.unittest package to telemetry.unittest_util.
I encounter import naming conflict for |unittest| when trying to create
benchmark_unittest.py. It's possible to use absolute import to resolve it but I
believe unittest_util is a better naming anyway.
Note that there are some code in third_party/ and other
places that still references telemetry.unittest. This patch
gets around breaking those by adding telemetry/unittest.py
file that loads all modules in telemetry/unittest_util.py.
BUG=432228
Review URL: https://codereview.chromium.org/713983002
Cr-Commit-Position: refs/heads/master@{#303932}
Diffstat (limited to 'content')
| -rw-r--r-- | content/test/gpu/page_sets/page_set_unittest.py | 2 | ||||
| -rwxr-xr-x | content/test/gpu/run_unittests | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/content/test/gpu/page_sets/page_set_unittest.py b/content/test/gpu/page_sets/page_set_unittest.py index b3203f7..205f6ee 100644 --- a/content/test/gpu/page_sets/page_set_unittest.py +++ b/content/test/gpu/page_sets/page_set_unittest.py @@ -4,7 +4,7 @@ import os -from telemetry.unittest import page_set_smoke_test +from telemetry.unittest_util import page_set_smoke_test class PageSetUnitTest(page_set_smoke_test.PageSetSmokeTest): diff --git a/content/test/gpu/run_unittests b/content/test/gpu/run_unittests index 62d8cfe..15ba9ae 100755 --- a/content/test/gpu/run_unittests +++ b/content/test/gpu/run_unittests @@ -15,8 +15,8 @@ import sys sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir, 'tools', 'telemetry')) -from telemetry.unittest import gtest_progress_reporter -from telemetry.unittest import run_tests +from telemetry.unittest_util import gtest_progress_reporter +from telemetry.unittest_util import run_tests if __name__ == '__main__': |