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

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

Issue 12813013: [Telemetry] Cause web server to keep resources in memory and thread requests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nduca comments Created 7 years, 9 months 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/page.py
diff --git a/tools/telemetry/telemetry/page/page.py b/tools/telemetry/telemetry/page/page.py
index 5dbc6c61d63fcea7790b95bddde1f6cbe5dcc6f9..24a279af5c7de0903d987d736a94a8c04f47172c 100644
--- a/tools/telemetry/telemetry/page/page.py
+++ b/tools/telemetry/telemetry/page/page.py
@@ -32,7 +32,7 @@ class Page(object):
# otherwise the '/' will be missing between page_set.base_dir and
# parsed_url.path.
@property
- def url_base_dir_and_file(self):
+ def serving_dirs_and_file(self):
parsed_url = urlparse.urlparse(self.url)
# Don't use os.path.join otherwise netloc and path can't point to relative
@@ -41,10 +41,11 @@ class Page(object):
path = self.base_dir + parsed_url.netloc + parsed_url.path
- if hasattr(self, 'url_base_dir'):
- parsed_url = urlparse.urlparse(self.url_base_dir)
- base_path = self.base_dir + parsed_url.netloc + parsed_url.path
- return (base_path, path.replace(base_path, ''))
+ if hasattr(self, 'serving_dirs'):
+ url_base_dir = os.path.commonprefix(self.serving_dirs)
+ base_path = self.base_dir + '/' + url_base_dir
+ return ([self.base_dir + '/' + d for d in self.serving_dirs],
+ path.replace(base_path, ''))
return os.path.split(path)
« no previous file with comments | « tools/telemetry/telemetry/page/actions/wait_unittest.py ('k') | tools/telemetry/telemetry/page/page_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698