diff options
| author | aiolos <aiolos@chromium.org> | 2015-06-25 15:42:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-25 22:42:54 +0000 |
| commit | 57fa7b351455df84db4507f370417c4808101e99 (patch) | |
| tree | 8592dbfd31354461d0705c3009b75d777e8f3be9 /tools/chrome_proxy | |
| parent | 8a1265c972951bd1685f1ef349833f1480fe63d0 (diff) | |
| download | chromium_src-57fa7b351455df84db4507f370417c4808101e99.zip chromium_src-57fa7b351455df84db4507f370417c4808101e99.tar.gz chromium_src-57fa7b351455df84db4507f370417c4808101e99.tar.bz2 | |
Discover should return a list of classes, not a dictionary.
Add classes_util.
BUG=498968
CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:linux_perf_bisect;tryserver.chromium.perf:mac_perf_bisect;tryserver.chromium.perf:win_perf_bisect;tryserver.chromium.perf:android_nexus5_perf_bisect
Review URL: https://codereview.chromium.org/1194723002
Cr-Commit-Position: refs/heads/master@{#336283}
Diffstat (limited to 'tools/chrome_proxy')
| -rw-r--r-- | tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/__init__.py | 5 | ||||
| -rw-r--r-- | tools/chrome_proxy/live_tests/pagesets/__init__.py | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/__init__.py b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/__init__.py index 9f24d4d..9fa99ce 100644 --- a/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/__init__.py +++ b/tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/__init__.py @@ -6,8 +6,8 @@ import inspect import os import sys -from telemetry.core import discover from telemetry.page import page_set +from telemetry.util import classes_util import video @@ -15,8 +15,7 @@ import video start_dir = os.path.dirname(os.path.abspath(__file__)) top_level_dir = os.path.abspath(os.path.join(start_dir, os.pardir, os.pardir)) base_class = page_set.PageSet -for cls in discover.DiscoverClasses( - start_dir, top_level_dir, base_class).values(): +for cls in classes_util.DiscoverClasses(start_dir, top_level_dir, base_class): setattr(sys.modules[__name__], cls.__name__, cls) # DiscoverClasses makes the assumption that there is exactly one matching diff --git a/tools/chrome_proxy/live_tests/pagesets/__init__.py b/tools/chrome_proxy/live_tests/pagesets/__init__.py index 1ea4db1..7053fda 100644 --- a/tools/chrome_proxy/live_tests/pagesets/__init__.py +++ b/tools/chrome_proxy/live_tests/pagesets/__init__.py @@ -6,7 +6,7 @@ import inspect import os import sys -from telemetry.core import discover +import discover from telemetry.page import page_set @@ -14,7 +14,6 @@ from telemetry.page import page_set start_dir = os.path.dirname(os.path.abspath(__file__)) top_level_dir = os.path.abspath(os.path.join(start_dir, os.pardir, os.pardir)) base_class = page_set.PageSet -for cls in discover.DiscoverClasses( - start_dir, top_level_dir, base_class).values(): +for cls in classes_util.DiscoverClasses(start_dir, top_level_dir, base_class): setattr(sys.modules[__name__], cls.__name__, cls) |