diff options
| author | simonhatch@chromium.org <simonhatch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-26 20:40:21 +0000 |
|---|---|---|
| committer | simonhatch@chromium.org <simonhatch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-26 20:40:21 +0000 |
| commit | 6e93e98c4f148800046435d5778ed52e7db3280e (patch) | |
| tree | 468cc40f261e7abc76ecad45a4f6786dc30169a1 | |
| parent | 839ef2d812c2596732bbf8ec90b767a7176c960e (diff) | |
| download | chromium_src-6e93e98c4f148800046435d5778ed52e7db3280e.zip chromium_src-6e93e98c4f148800046435d5778ed52e7db3280e.tar.gz chromium_src-6e93e98c4f148800046435d5778ed52e7db3280e.tar.bz2 | |
Revert 279909 "In page_runner, only look in the page_set bucket ..."
Speculative revert to fix failing test.
> In page_runner, only look in the page_set bucket for wpr files.
>
> R=dtu@chromium.org, tonyg@chromium.org
> BUG=356956
>
> Review URL: https://codereview.chromium.org/330193003
TBR=aiolos@chromium.org
Review URL: https://codereview.chromium.org/343753006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280094 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/telemetry/telemetry/page/page_runner.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/telemetry/telemetry/page/page_runner.py b/tools/telemetry/telemetry/page/page_runner.py index ff37e54..562c339 100644 --- a/tools/telemetry/telemetry/page/page_runner.py +++ b/tools/telemetry/telemetry/page/page_runner.py @@ -305,8 +305,7 @@ def _UpdatePageSetArchivesIfChanged(page_set): if page_set.credentials_path: try: cloud_storage.GetIfChanged( - os.path.join(page_set.base_dir, page_set.credentials_path), - page_set.bucket) + os.path.join(page_set.base_dir, page_set.credentials_path)) except (cloud_storage.CredentialsError, cloud_storage.PermissionError, cloud_storage.CloudStorageError) as e: logging.warning('Cannot retrieve credential file %s due to cloud storage ' @@ -329,7 +328,7 @@ def _UpdatePageSetArchivesIfChanged(page_set): os.path.join(dirpath, filename)) if extension != '.sha1': continue - cloud_storage.GetIfChanged(path, page_set.bucket) + cloud_storage.GetIfChanged(path) def Run(test, page_set, expectations, finder_options): |