diff options
| author | nednguyen <nednguyen@google.com> | 2014-11-24 11:57:31 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-24 19:59:32 +0000 |
| commit | 7b7bc1ffbd62ed416edf4b1944ac366e62a337d8 (patch) | |
| tree | e5ea44146e157ef7c24f02b15492dc5fca2fba2c /tools/perf | |
| parent | 307596b6e5c896570008b974149dbdf75b44c2ef (diff) | |
| download | chromium_src-7b7bc1ffbd62ed416edf4b1944ac366e62a337d8.zip chromium_src-7b7bc1ffbd62ed416edf4b1944ac366e62a337d8.tar.gz chromium_src-7b7bc1ffbd62ed416edf4b1944ac366e62a337d8.tar.bz2 | |
[Telemetry] Introduce shared_user_story_state for real.
Reland patch from issue 733303003
Modify patch 733303003 to make sure that TearDown() is only called once for
each group in normal condition. (See http://crbug.com/435775)
To review this patch:
Patch set #1 is patched from 733303003.
Patch set #2 add the fix & unittest to crbug/435775
BUG=418278
Review URL: https://codereview.chromium.org/749063002
Cr-Commit-Position: refs/heads/master@{#305480}
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/measurements/page_cycler_unittest.py | 6 | ||||
| -rw-r--r-- | tools/perf/profile_creators/extensions_profile_creator.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/perf/measurements/page_cycler_unittest.py b/tools/perf/measurements/page_cycler_unittest.py index 87eb669..164e69f 100644 --- a/tools/perf/measurements/page_cycler_unittest.py +++ b/tools/perf/measurements/page_cycler_unittest.py @@ -5,9 +5,9 @@ import unittest from telemetry.core import browser_options -from telemetry.page import page_runner from telemetry.results import page_test_results from telemetry.unittest_util import simple_mock +from telemetry.user_story import user_story_runner from measurements import page_cycler @@ -106,11 +106,11 @@ class PageCyclerUnitTest(unittest.TestCase): options = browser_options.BrowserFinderOptions() options.browser_options.platform = FakePlatform() parser = options.CreateParser() - page_runner.AddCommandLineArgs(parser) + user_story_runner.AddCommandLineArgs(parser) args = ['--page-repeat=%i' % page_repeat, '--pageset-repeat=%i' % pageset_repeat] parser.parse_args(args) - page_runner.ProcessCommandLineArgs(parser, options) + user_story_runner.ProcessCommandLineArgs(parser, options) cycler.CustomizeBrowserOptions(options.browser_options) if setup_memory_module: diff --git a/tools/perf/profile_creators/extensions_profile_creator.py b/tools/perf/profile_creators/extensions_profile_creator.py index 88dbb57..027439b 100644 --- a/tools/perf/profile_creators/extensions_profile_creator.py +++ b/tools/perf/profile_creators/extensions_profile_creator.py @@ -206,7 +206,7 @@ class ExtensionsProfileCreator(profile_creator.ProfileCreator): # Phase 1: When the first page is loaded: we wait for a timeout to allow # all extensions to install and to prime safe browsing and other # caches. Extensions may open tabs as part of the install process. - # Phase 2: When the second page loads, page_runner closes all tabs - + # Phase 2: When the second page loads, user_story_runner closes all tabs - # we are left with one open tab, wait for that to finish loading. # Sleep for a bit to allow safe browsing and other data to load + |