diff options
| author | dtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-16 21:34:13 +0000 |
|---|---|---|
| committer | dtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-16 21:34:13 +0000 |
| commit | 8f8847b853b33e1cecba09d7febca2cd8b520e85 (patch) | |
| tree | e7bfefbb6239686b6d0f23b05fa4c6d500fd4349 /tools | |
| parent | 84b098a98018bd48fe145098c0caf1b31d51dfc3 (diff) | |
| download | chromium_src-8f8847b853b33e1cecba09d7febca2cd8b520e85.zip chromium_src-8f8847b853b33e1cecba09d7febca2cd8b520e85.tar.gz chromium_src-8f8847b853b33e1cecba09d7febca2cd8b520e85.tar.bz2 | |
Fix file paths in dromaeo tests
Following https://codereview.chromium.org/24451002 the dromaeo tests
stopped running because:
1) The URL was of the form file:/// whereas a relative path is now
expected to be file://
2) navigate.py was stripping query and fragment off file URLs. These
are needed to control dromaeo.
BUG=308120
R=dtu@chromium.org
Review URL: https://codereview.chromium.org/27517004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/benchmarks/dromaeo.py | 2 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/page/actions/navigate.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/perf/benchmarks/dromaeo.py b/tools/perf/benchmarks/dromaeo.py index 1ed7bad..b6d2fa1 100644 --- a/tools/perf/benchmarks/dromaeo.py +++ b/tools/perf/benchmarks/dromaeo.py @@ -20,7 +20,7 @@ class DromaeoBenchmark(test.Test): # Subclasses are expected to define a class member called query_param. if not hasattr(self, 'query_param'): raise NotImplementedError('query_param not in Dromaeo benchmark.') - url = ('file:///../../../../chrome/test/data/dromaeo/index.html' + url = ('file://../../../../chrome/test/data/dromaeo/index.html' '?%s&automated' % self.query_param) # The docstring of benchmark classes may also be used as a description # when 'run_benchmarks list' is run. diff --git a/tools/telemetry/telemetry/page/actions/navigate.py b/tools/telemetry/telemetry/page/actions/navigate.py index fc82ffe..d64d5d3 100644 --- a/tools/telemetry/telemetry/page/actions/navigate.py +++ b/tools/telemetry/telemetry/page/actions/navigate.py @@ -4,14 +4,15 @@ from telemetry.page.actions import page_action - class NavigateAction(page_action.PageAction): def __init__(self, attributes=None): super(NavigateAction, self).__init__(attributes) def RunAction(self, page, tab, previous_action): if page.is_file: - target_side_url = tab.browser.http_server.UrlOf(page.file_path) + query = page.url.partition('?')[2] + target_side_url = (tab.browser.http_server.UrlOf(page.file_path) + '?' + + query) else: target_side_url = page.url |