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

Unified Diff: telemetry/telemetry/wpr/archive_info.py

Issue 2664043002: Revert of [WPR] Implement platform dependent recordings for WPR archives. (Closed)
Patch Set: Created 3 years, 11 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 | « telemetry/telemetry/story/story_set.py ('k') | telemetry/telemetry/wpr/archive_info2.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: telemetry/telemetry/wpr/archive_info.py
diff --git a/telemetry/telemetry/wpr/archive_info.py b/telemetry/telemetry/wpr/archive_info.py
index 8ef370b19b259326219803fccb4ab64c5ef139e7..326da2d36b7411bcd7a7db5aa1212dc1f4991ab2 100644
--- a/telemetry/telemetry/wpr/archive_info.py
+++ b/telemetry/telemetry/wpr/archive_info.py
@@ -9,12 +9,9 @@
import shutil
import tempfile
-from telemetry.wpr import archive_info2
-
from py_utils import cloud_storage # pylint: disable=import-error
-# TODO(rnephew): Remove this file when archive_info2 is the default.
def AssertValidCloudStorageBucket(bucket):
is_valid = bucket in (None,
cloud_storage.PUBLIC_BUCKET,
@@ -59,8 +56,6 @@
if os.path.exists(file_path):
with open(file_path, 'r') as f:
data = json.load(f)
- if data.get('platform_specific', False):
- return archive_info2.WprArchiveInfo(file_path, data, bucket)
return cls(file_path, data, bucket)
return cls(file_path, {'archives': {}}, bucket)
@@ -102,8 +97,7 @@
"upload_to_cloud_storage")
raise
- def WprFilePathForStory(self, story, target_platform=None):
- del target_platform
+ def WprFilePathForStory(self, story):
if self.temp_target_wpr_file_path:
return self.temp_target_wpr_file_path
wpr_file = self._story_name_to_wpr_file.get(story.display_name, None)
« no previous file with comments | « telemetry/telemetry/story/story_set.py ('k') | telemetry/telemetry/wpr/archive_info2.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698