Telemetry no longer supports credential files so remove support
NoTry: true
Bug: skia:7401
Change-Id: I18b2dfe92b6e998d0799ed95cd5d735706428d1c
Reviewed-on: https://skia-review.googlesource.com/84540
Commit-Queue: Ravi Mistry <rmistry@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/tools/skp/webpages_playback.py b/tools/skp/webpages_playback.py
index 6a8562b..e8dcc62 100644
--- a/tools/skp/webpages_playback.py
+++ b/tools/skp/webpages_playback.py
@@ -33,11 +33,10 @@
to capture archives and/or capture SKP files. Majority of the time it should be
a newly built chrome binary.
-The --data_store flag controls where the needed artifacts, such as
-credential files, are downloaded from. It also controls where the
-generated artifacts, such as recorded webpages and resulting skp renderings,
-are uploaded to. URLs with scheme 'gs://' use Google Storage. Otherwise
-use local filesystem.
+The --data_store flag controls where the needed artifacts are downloaded from.
+It also controls where the generated artifacts, such as recorded webpages and
+resulting skp renderings, are uploaded to. URLs with scheme 'gs://' use Google
+Storage. Otherwise use local filesystem.
The --upload=True flag means generated artifacts will be
uploaded or copied to the location specified by --data_store. (default value is
@@ -76,13 +75,6 @@
os.path.abspath(os.path.dirname(__file__)), 'page_sets', 'data')
TMP_SKP_DIR = tempfile.mkdtemp()
-# Location of the credentials.json file and the string that represents missing
-# passwords.
-CREDENTIALS_FILE_PATH = os.path.join(
- os.path.abspath(os.path.dirname(__file__)), 'page_sets', 'data',
- 'credentials.json'
-)
-
# Name of the SKP benchmark
SKP_BENCHMARK = 'skpicture_printer'
@@ -101,9 +93,6 @@
# How many times the run_benchmark binary should be retried.
RETRY_RUN_MEASUREMENT_COUNT = 3
-# Location of the credentials.json file in Google Storage.
-CREDENTIALS_GS_PATH = 'playback/credentials/credentials.json'
-
X11_DISPLAY = os.getenv('DISPLAY', ':0')
# Path to Chromium's page sets.
@@ -199,26 +188,6 @@
def Run(self):
"""Run the SkPicturePlayback BuildStep."""
- # Download the credentials file if it was not previously downloaded.
- if not os.path.isfile(CREDENTIALS_FILE_PATH):
- # Download the credentials.json file from Google Storage.
- self.gs.download_file(CREDENTIALS_GS_PATH, CREDENTIALS_FILE_PATH)
-
- if not os.path.isfile(CREDENTIALS_FILE_PATH):
- print """\n\nCould not locate credentials file in the storage.
- Please create a %s file that contains:
- {
- "google": {
- "username": "google_testing_account_username",
- "password": "google_testing_account_password"
- },
- "facebook": {
- "username": "facebook_testing_account_username",
- "password": "facebook_testing_account_password"
- }
- }\n\n""" % CREDENTIALS_FILE_PATH
- raw_input("Please press a key when you are ready to proceed...")
-
# Delete any left over data files in the data directory.
for archive_file in glob.glob(
os.path.join(LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR, 'skia_*')):