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

Unified Diff: telemetry/telemetry/page/shared_page_state.py

Issue 1871033002: Remove code for pregenerated profile handling from SharedPageState (Closed) Base URL: https://github.com/catapult-project/catapult.git@master
Patch Set: Resolve conflicts Created 4 years, 8 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: telemetry/telemetry/page/shared_page_state.py
diff --git a/telemetry/telemetry/page/shared_page_state.py b/telemetry/telemetry/page/shared_page_state.py
index bf1c34b0adcd0729f168e4d87eb8a702288e5daa..9a4fbb44356e507e872e82d8846de54e8d7cdf2a 100644
--- a/telemetry/telemetry/page/shared_page_state.py
+++ b/telemetry/telemetry/page/shared_page_state.py
@@ -4,12 +4,8 @@
import logging
import os
-import shutil
import sys
import tempfile
-import zipfile
-
-from catapult_base import cloud_storage # pylint: disable=import-error
from telemetry.core import exceptions
from telemetry.core import util
@@ -82,9 +78,7 @@ class SharedPageState(story.SharedState):
self._did_login_for_current_page = False
self._current_page = None
self._current_tab = None
- self._migrated_profile = None
- self._pregenerated_profile_archive_dir = None
self._test.SetOptions(self._finder_options)
# TODO(crbug/404771): Move network controller options out of
@@ -228,12 +222,6 @@ class SharedPageState(story.SharedState):
# benchmarks.
self.platform.tracing_controller.ClearStateIfNeeded()
- if self._ShouldDownloadPregeneratedProfileArchive():
- self._DownloadPregeneratedProfileArchive()
-
- if self._ShouldMigrateProfile():
- self._MigratePregeneratedProfile()
-
page_set = page.page_set
self._current_page = page
if self._browser and (self._test.RestartBrowserBeforeEachPage()
@@ -353,10 +341,6 @@ class SharedPageState(story.SharedState):
raise
def TearDownState(self):
- if self._migrated_profile:
- shutil.rmtree(self._migrated_profile)
- self._migrated_profile = None
-
self._StopBrowser()
self.platform.StopAllLocalServers()
self.platform.network_controller.Close()
@@ -384,137 +368,6 @@ class SharedPageState(story.SharedState):
results.AddProfilingFile(self._current_page,
file_handle.FromFilePath(f))
- def _ShouldMigrateProfile(self):
- return not self._migrated_profile
-
- def _MigrateProfile(self, finder_options, found_browser,
- initial_profile, final_profile):
- """Migrates a profile to be compatible with a newer version of Chrome.
-
- Launching Chrome with the old profile will perform the migration.
- """
- # Save the current input and output profiles.
- saved_input_profile = finder_options.browser_options.profile_dir
- saved_output_profile = finder_options.browser_options.output_profile_path
-
- # Set the input and output profiles.
- finder_options.browser_options.profile_dir = initial_profile
- finder_options.browser_options.output_profile_path = final_profile
-
- # Launch the browser, then close it.
- browser = found_browser.Create(finder_options)
- browser.Close()
-
- # Load the saved input and output profiles.
- finder_options.browser_options.profile_dir = saved_input_profile
- finder_options.browser_options.output_profile_path = saved_output_profile
-
- def _MigratePregeneratedProfile(self):
- """Migrates the pre-generated profile by launching Chrome with it.
-
- On success, updates self._migrated_profile and
- self._finder_options.browser_options.profile_dir with the directory of the
- migrated profile.
- """
- self._migrated_profile = tempfile.mkdtemp()
- logging.info("Starting migration of pre-generated profile to %s",
- self._migrated_profile)
- pregenerated_profile = self._finder_options.browser_options.profile_dir
-
- possible_browser = self._FindBrowser(self._finder_options)
- self._MigrateProfile(self._finder_options, possible_browser,
- pregenerated_profile, self._migrated_profile)
- self._finder_options.browser_options.profile_dir = self._migrated_profile
- logging.info("Finished migration of pre-generated profile to %s",
- self._migrated_profile)
-
- def GetPregeneratedProfileArchiveDir(self):
- return self._pregenerated_profile_archive_dir
-
- def SetPregeneratedProfileArchiveDir(self, archive_path):
- """
- Benchmarks can set a pre-generated profile archive to indicate that when
- Chrome is launched, it should have a --user-data-dir set to the
- pre-generated profile, rather than to an empty profile.
-
- If the benchmark is invoked with the option --profile-dir=<dir>, that
- option overrides this value.
- """
- self._pregenerated_profile_archive_dir = archive_path
-
- def _ShouldDownloadPregeneratedProfileArchive(self):
- """Whether to download a pre-generated profile archive."""
- # There is no pre-generated profile archive.
- if not self.GetPregeneratedProfileArchiveDir():
- return False
-
- # If profile dir is specified on command line, use that instead.
- if self._finder_options.browser_options.profile_dir:
- logging.warning("Profile directory specified on command line: %s, this"
- "overrides the benchmark's default profile directory.",
- self._finder_options.browser_options.profile_dir)
- return False
-
- # If the browser is remote, a local download has no effect.
- if self._possible_browser.IsRemote():
- return False
-
- return True
-
- def _DownloadPregeneratedProfileArchive(self):
- """Download and extract the profile directory archive if one exists.
-
- On success, updates self._finder_options.browser_options.profile_dir with
- the directory of the extracted profile.
- """
- # Download profile directory from cloud storage.
- generated_profile_archive_path = self.GetPregeneratedProfileArchiveDir()
-
- try:
- cloud_storage.GetIfChanged(generated_profile_archive_path,
- cloud_storage.PUBLIC_BUCKET)
- except (cloud_storage.CredentialsError,
- cloud_storage.PermissionError) as e:
- if os.path.exists(generated_profile_archive_path):
- # If the profile directory archive exists, assume the user has their
- # own local copy simply warn.
- logging.warning('Could not download Profile archive: %s',
- generated_profile_archive_path)
- else:
- # If the archive profile directory doesn't exist, this is fatal.
- logging.error('Can not run without required profile archive: %s. '
- 'If you believe you have credentials, follow the '
- 'instructions below.',
- generated_profile_archive_path)
- logging.error(str(e))
- sys.exit(-1)
-
- # Check to make sure the zip file exists.
- if not os.path.isfile(generated_profile_archive_path):
- raise Exception("Profile directory archive not downloaded: ",
- generated_profile_archive_path)
-
- # The location to extract the profile into.
- extracted_profile_dir_path = (
- os.path.splitext(generated_profile_archive_path)[0])
-
- # Unzip profile directory.
- with zipfile.ZipFile(generated_profile_archive_path) as f:
- try:
- f.extractall(os.path.dirname(generated_profile_archive_path))
- except e:
- # Cleanup any leftovers from unzipping.
- if os.path.exists(extracted_profile_dir_path):
- shutil.rmtree(extracted_profile_dir_path)
- logging.error("Error extracting profile directory zip file: %s", e)
- sys.exit(-1)
-
- # Run with freshly extracted profile directory.
- logging.info("Using profile archive directory: %s",
- extracted_profile_dir_path)
- self._finder_options.browser_options.profile_dir = (
- extracted_profile_dir_path)
-
class SharedMobilePageState(SharedPageState):
_device_type = 'mobile'
« 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