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

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

Issue 657163002: Simplify server_dirs algorithm. os.path.join('/foo', '/bar') gives '/bar'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make servings_dirs a read-only property. Created 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/page/page_set.py
diff --git a/tools/telemetry/telemetry/page/page_set.py b/tools/telemetry/telemetry/page/page_set.py
index ce4a67549ba47c320708039b4b9dbd1192b355a7..4dca718fbf6b696a8d7aaacc0030e87add43685d 100644
--- a/tools/telemetry/telemetry/page/page_set.py
+++ b/tools/telemetry/telemetry/page/page_set.py
@@ -41,14 +41,9 @@ class PageSet(user_story_set.UserStorySet):
self._wpr_archive_info = None
self.startup_url = startup_url
self.user_stories = []
- self.serving_dirs = set()
- serving_dirs = [] if serving_dirs is None else serving_dirs
- # Makes sure that page_set's serving_dirs are absolute paths
- for sd in serving_dirs:
- if os.path.isabs(sd):
- self.serving_dirs.add(os.path.realpath(sd))
- else:
- self.serving_dirs.add(os.path.realpath(os.path.join(self.base_dir, sd)))
+ # Convert any relative serving_dirs to absolute paths.
+ self._serving_dirs = set(os.path.realpath(os.path.join(self.base_dir, d))
+ for d in serving_dirs or [])
if self._IsValidPrivacyBucket(bucket):
self._bucket = bucket
else:
@@ -89,6 +84,10 @@ class PageSet(user_story_set.UserStorySet):
return self.file_path
@property
+ def serving_dirs(self):
+ return self._serving_dirs
+
+ @property
def wpr_archive_info(self): # pylint: disable=E0202
"""Lazily constructs wpr_archive_info if it's not set and returns it."""
if self.archive_data_file and not self._wpr_archive_info:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698