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

Unified Diff: tools/telemetry/telemetry/user_story/user_story_set.py

Issue 946473002: Move base_dir to user_story_set, remove file_path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/user_story/user_story_set.py
diff --git a/tools/telemetry/telemetry/user_story/user_story_set.py b/tools/telemetry/telemetry/user_story/user_story_set.py
index b4315ffc9e7799afe216fa37bcf115909d0daace..a160b52602988a20a64a31d57755e49ee848ea90 100644
--- a/tools/telemetry/telemetry/user_story/user_story_set.py
+++ b/tools/telemetry/telemetry/user_story/user_story_set.py
@@ -17,7 +17,7 @@ class UserStorySet(object):
"""
def __init__(self, archive_data_file='', cloud_storage_bucket=None,
- serving_dirs=None):
+ base_dir=None, serving_dirs=None):
"""Creates a new UserStorySet.
Args:
@@ -33,11 +33,21 @@ class UserStorySet(object):
self._wpr_archive_info = None
archive_info.AssertValidCloudStorageBucket(cloud_storage_bucket)
self._cloud_storage_bucket = cloud_storage_bucket
- self._base_dir = os.path.dirname(inspect.getfile(self.__class__))
+ if base_dir:
+ if not os.path.isdir(base_dir):
+ raise ValueError('Must provide valid directory path for base_dir.')
+ self._base_dir = base_dir
+ else:
+ self._base_dir = os.path.dirname(inspect.getfile(self.__class__))
# 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 [])
+
+ @property
+ def file_path(self):
+ return inspect.getfile(self.__class__).replace('.pyc', '.py')
+
@property
def base_dir(self):
"""The base directory to resolve archive_data_file.

Powered by Google App Engine
This is Rietveld 408576698