Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(208)

Unified Diff: tools/telemetry/telemetry/page_set_url_builder.py

Issue 11419320: [Telemetry] Port page cycler to Telemetry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tabs Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/telemetry/telemetry/page_set_url_builder.py
diff --git a/tools/telemetry/telemetry/page_set_url_builder.py b/tools/telemetry/telemetry/page_set_url_builder.py
index 06373706ed0bd1c136be7b438448fab2fe53ceb1..b054a2c531baf1763d95c44c5b2347a9961e1320 100644
--- a/tools/telemetry/telemetry/page_set_url_builder.py
+++ b/tools/telemetry/telemetry/page_set_url_builder.py
@@ -2,11 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import os
+import urlparse
# NOTE: This assumes the page_set file uses 'file:///' instead of 'file://',
# otherwise the '/' will be missing between page_set.base_dir and
# parsed_url.path.
-def GetUrlBaseDirAndFile(page_set_base_dir, parsed_url):
+def GetUrlBaseDirAndFile(page, page_set_base_dir, parsed_url):
# Don't use os.path.join otherwise netloc and path can't point to relative
# directories.
assert parsed_url.path[0] == '/'
@@ -15,4 +16,9 @@ def GetUrlBaseDirAndFile(page_set_base_dir, parsed_url):
parsed_url.netloc +
parsed_url.path) # pylint: disable=E1101
+ if hasattr(page, 'url_base_dir'):
+ parsed_url = urlparse.urlparse(page.url_base_dir)
+ base_path = (page_set_base_dir + parsed_url.netloc + parsed_url.path)
+ return (base_path, path.replace(base_path, ''))
+
return os.path.split(path)
« no previous file with comments | « tools/telemetry/telemetry/page_runner.py ('k') | tools/telemetry/telemetry/page_set_url_builder_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698