summaryrefslogtreecommitdiffstats
path: root/tools/perf/page_sets
diff options
context:
space:
mode:
authornednguyen <nednguyen@google.com>2014-11-12 16:15:35 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-13 00:16:04 +0000
commit1ad14348963665d58bc65c8c327e00c8c11da0c9 (patch)
treeaa5b65d3456e477641afd20d992864e516f27832 /tools/perf/page_sets
parent438740dae5d7f74feabf8c5ffd29a6194eee43dd (diff)
downloadchromium_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 'tools/perf/page_sets')
-rw-r--r--tools/perf/page_sets/page_set_unittest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/page_sets/page_set_unittest.py b/tools/perf/page_sets/page_set_unittest.py
index d5dfd3f..af24525 100644
--- a/tools/perf/page_sets/page_set_unittest.py
+++ b/tools/perf/page_sets/page_set_unittest.py
@@ -5,7 +5,7 @@
import os
from telemetry import decorators
-from telemetry.unittest import page_set_smoke_test
+from telemetry.unittest_util import page_set_smoke_test
class PageSetUnitTest(page_set_smoke_test.PageSetSmokeTest):