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

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

Issue 24451002: [telemetry] Support absolute paths by changing file:/// to file://. More robust file path handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test on mac, apparently /tmp is a symlink to /private/tmp Created 7 years, 2 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_runner.py
diff --git a/tools/telemetry/telemetry/page/page_runner.py b/tools/telemetry/telemetry/page/page_runner.py
index b968e0e5d7036404703b743ccaa8c7734a760cac..7d3b3408726dcc626152c8fdb4b90c19e77a8ee4 100644
--- a/tools/telemetry/telemetry/page/page_runner.py
+++ b/tools/telemetry/telemetry/page/page_runner.py
@@ -133,8 +133,9 @@ class PageState(object):
def PreparePage(self, page, tab, test=None):
if page.is_file:
- serving_dirs = page.serving_dirs_and_file[0]
- if tab.browser.SetHTTPServerDirectories(serving_dirs) and test:
+ server_started = tab.browser.SetHTTPServerDirectories(
+ page.page_set.serving_dirs | set([page.serving_dir]))
+ if server_started and test:
test.DidStartHTTPServer(tab)
if page.credentials:

Powered by Google App Engine
This is Rietveld 408576698