diff options
| author | aiolos <aiolos@chromium.org> | 2015-08-03 16:49:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-03 23:50:33 +0000 |
| commit | 7e6fefcf3b839256c97e2e7bc0bfc3c53af75c8d (patch) | |
| tree | b2047e923356ef98515051282b8ec1752d5bf162 /tools/chrome_proxy | |
| parent | 7e3f325ebd8689f2beef2ec58879f0aa48382892 (diff) | |
| download | chromium_src-7e6fefcf3b839256c97e2e7bc0bfc3c53af75c8d.zip chromium_src-7e6fefcf3b839256c97e2e7bc0bfc3c53af75c8d.tar.gz chromium_src-7e6fefcf3b839256c97e2e7bc0bfc3c53af75c8d.tar.bz2 | |
Reland of Create classes_util API, change discover to return a list instead of a dict. (patchset #1 id:1 of https://codereview.chromium.org/1263063003/)
Reason for revert:
The telemetry tests aren't broken. The perf_unittests are because they don't pick tests in a deterministic way. Reverting after a change to make them deterministic.
Original issue's description:
> Revert of Create classes_util API, change discover to return a list instead of a dict. (patchset #5 id:120001 of https://codereview.chromium.org/1244223002/)
>
> Reason for revert:
> This appears to break the XP telemetry tests. Details on the bug.
>
> Original issue's description:
> > Create classes_util API, change discover to return a list instead of a dict.
> >
> > BUG=498968
> > CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:linux_perf_bisect;tryserver.chromium.perf:win_perf_bisect;tryserver.chromium.perf:android_nexus5_perf_bisect
> >
> > Committed: https://crrev.com/e6cbec4747aa7fe3c96b1cdb89de21ae77b30ab0
> > Cr-Commit-Position: refs/heads/master@{#341129}
>
> TBR=dtu@chromium.org,bengr@chromium.org,aiolos@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=498968
>
> Committed: https://crrev.com/c85e3e1af7e170d5f8ec2b012df6e9337d2352bb
> Cr-Commit-Position: refs/heads/master@{#341218}
TBR=dtu@chromium.org,bengr@chromium.org,avi@chromium.org
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/1262623007
Cr-Commit-Position: refs/heads/master@{#341646}
Diffstat (limited to 'tools/chrome_proxy')
| -rw-r--r-- | tools/chrome_proxy/integration_tests/chrome_proxy_pagesets/__init__.py | 6 | ||||
| -rw-r--r-- | tools/chrome_proxy/live_tests/pagesets/__init__.py | 5 |
2 files changed, 5 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 799c246..c5699ad 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,9 @@ import inspect import os import sys -from telemetry.core import discover from telemetry import story +from telemetry.util import classes_util + import video @@ -15,8 +16,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 = story.StorySet -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 45ce4af..a67d12d 100644 --- a/tools/chrome_proxy/live_tests/pagesets/__init__.py +++ b/tools/chrome_proxy/live_tests/pagesets/__init__.py @@ -6,15 +6,14 @@ import inspect import os import sys -from telemetry.core import discover from telemetry import story +from telemetry.util import classes_util # Import all submodules' StorySet classes. 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 = story.StorySet -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) |