summaryrefslogtreecommitdiffstats
path: root/tools/perf/measurements
diff options
context:
space:
mode:
authoraiolos <aiolos@chromium.org>2015-05-01 15:00:14 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-01 22:00:56 +0000
commit1f2a81e9697abb10ee9448468a2cad823e6066be (patch)
treea1f2037cc9a2d2f9e31caeed7755c01819553c70 /tools/perf/measurements
parent30443501e221f5d6f73719696bee8996ee02c015 (diff)
downloadchromium_src-1f2a81e9697abb10ee9448468a2cad823e6066be.zip
chromium_src-1f2a81e9697abb10ee9448468a2cad823e6066be.tar.gz
chromium_src-1f2a81e9697abb10ee9448468a2cad823e6066be.tar.bz2
Move user_story.user_story_runner to story.story_runner.
BUG=465594 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/1103163008 Cr-Commit-Position: refs/heads/master@{#327990}
Diffstat (limited to 'tools/perf/measurements')
-rw-r--r--tools/perf/measurements/page_cycler_unittest.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/measurements/page_cycler_unittest.py b/tools/perf/measurements/page_cycler_unittest.py
index a29737a..d98f320 100644
--- a/tools/perf/measurements/page_cycler_unittest.py
+++ b/tools/perf/measurements/page_cycler_unittest.py
@@ -6,9 +6,9 @@ import sys
import unittest
from telemetry.core import browser_options
+from telemetry.internal import story_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
from metrics import keychain_metric
@@ -114,11 +114,11 @@ class PageCyclerUnitTest(unittest.TestCase):
options = browser_options.BrowserFinderOptions()
options.browser_options.platform = FakePlatform()
parser = options.CreateParser()
- user_story_runner.AddCommandLineArgs(parser)
+ story_runner.AddCommandLineArgs(parser)
args = ['--page-repeat=%i' % page_repeat,
'--pageset-repeat=%i' % pageset_repeat]
parser.parse_args(args)
- user_story_runner.ProcessCommandLineArgs(parser, options)
+ story_runner.ProcessCommandLineArgs(parser, options)
cycler.CustomizeBrowserOptions(options.browser_options)
if setup_memory_module: