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

Unified Diff: tools/telemetry/third_party/gsutil/gslib/tests/test_Doption.py

Issue 1260493004: Revert "Add gsutil 4.13 to telemetry/third_party" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/third_party/gsutil/gslib/tests/test_Doption.py
diff --git a/tools/telemetry/third_party/gsutil/gslib/tests/test_Doption.py b/tools/telemetry/third_party/gsutil/gslib/tests/test_Doption.py
deleted file mode 100644
index ded088c70d62240de263a45a25010f80049af9e7..0000000000000000000000000000000000000000
--- a/tools/telemetry/third_party/gsutil/gslib/tests/test_Doption.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2013 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Integration tests for gsutil -D option."""
-
-from __future__ import absolute_import
-
-import gslib
-from gslib.cs_api_map import ApiSelector
-import gslib.tests.testcase as testcase
-from gslib.tests.testcase.integration_testcase import SkipForS3
-from gslib.tests.util import ObjectToURI as suri
-from gslib.tests.util import SetBotoConfigForTest
-from gslib.util import ONE_KIB
-
-
-@SkipForS3('-D output is implementation-specific.')
-class TestDOption(testcase.GsUtilIntegrationTestCase):
- """Integration tests for gsutil -D option."""
-
- def test_minus_D_multipart_upload(self):
- """Tests that debug option does not output upload media body."""
- # We want to ensure it works with and without a trailing newline.
- for file_contents in ('a1b2c3d4', 'a1b2c3d4\n'):
- fpath = self.CreateTempFile(contents=file_contents)
- bucket_uri = self.CreateBucket()
- with SetBotoConfigForTest(
- [('GSUtil', 'resumable_threshold', str(ONE_KIB))]):
- stderr = self.RunGsUtil(
- ['-D', 'cp', fpath, suri(bucket_uri)], return_stderr=True)
- print 'command line:' + ' '.join(['-D', 'cp', fpath, suri(bucket_uri)])
- if self.test_api == ApiSelector.JSON:
- self.assertIn('media body', stderr)
- self.assertNotIn('a1b2c3d4', stderr)
- self.assertIn('Comparing local vs cloud md5-checksum for', stderr)
- self.assertIn('total_bytes_transferred: %d' % len(file_contents),
- stderr)
-
- def test_minus_D_resumable_upload(self):
- fpath = self.CreateTempFile(contents='a1b2c3d4')
- bucket_uri = self.CreateBucket()
- with SetBotoConfigForTest([('GSUtil', 'resumable_threshold', '4')]):
- stderr = self.RunGsUtil(
- ['-D', 'cp', fpath, suri(bucket_uri)], return_stderr=True)
- self.assertNotIn('a1b2c3d4', stderr)
- self.assertIn('Comparing local vs cloud md5-checksum for', stderr)
- self.assertIn('total_bytes_transferred: 8', stderr)
-
- def test_minus_D_cat(self):
- """Tests cat command with debug option."""
- key_uri = self.CreateObject(contents='0123456789')
- with SetBotoConfigForTest([('Boto', 'proxy_pass', 'secret')]):
- (stdout, stderr) = self.RunGsUtil(
- ['-D', 'cat', suri(key_uri)], return_stdout=True, return_stderr=True)
- self.assertIn('You are running gsutil with debug output enabled.', stderr)
- self.assertIn("reply: 'HTTP/1.1 200 OK", stderr)
- self.assertIn('config:', stderr)
- self.assertIn("('proxy_pass', 'REDACTED')", stderr)
- self.assertIn("reply: 'HTTP/1.1 200 OK", stderr)
- self.assertIn('header: Expires: ', stderr)
- self.assertIn('header: Date: ', stderr)
- self.assertIn('header: Content-Type: application/octet-stream', stderr)
- self.assertIn('header: Content-Length: 10', stderr)
-
- if self.test_api == ApiSelector.XML:
- self.assertRegexpMatches(
- stderr, '.*HEAD /%s/%s.*Content-Length: 0.*User-Agent: .*gsutil/%s' %
- (key_uri.bucket_name, key_uri.object_name, gslib.VERSION))
-
- self.assertIn('header: Cache-Control: private, max-age=0',
- stderr)
- self.assertIn('header: Last-Modified: ', stderr)
- self.assertIn('header: ETag: "781e5e245d69b566979b86e28d23f2c7"', stderr)
- self.assertIn('header: x-goog-generation: ', stderr)
- self.assertIn('header: x-goog-metageneration: 1', stderr)
- self.assertIn('header: x-goog-hash: crc32c=KAwGng==', stderr)
- self.assertIn('header: x-goog-hash: md5=eB5eJF1ptWaXm4bijSPyxw==', stderr)
- elif self.test_api == ApiSelector.JSON:
- self.assertRegexpMatches(
- stderr, '.*GET.*b/%s/o/%s.*user-agent:.*gsutil/%s' %
- (key_uri.bucket_name, key_uri.object_name, gslib.VERSION))
- self.assertIn(('header: Cache-Control: no-cache, no-store, max-age=0, '
- 'must-revalidate'), stderr)
- self.assertIn("md5Hash: u'eB5eJF1ptWaXm4bijSPyxw=='", stderr)
-
- if gslib.IS_PACKAGE_INSTALL:
- self.assertIn('PACKAGED_GSUTIL_INSTALLS_DO_NOT_HAVE_CHECKSUMS', stdout)
- else:
- self.assertRegexpMatches(stdout, r'.*checksum: [0-9a-f]{32}.*')
- self.assertIn('gsutil version: %s' % gslib.VERSION, stdout)
- self.assertIn('boto version: ', stdout)
- self.assertIn('python version: ', stdout)
- self.assertIn('OS: ', stdout)
- self.assertIn('multiprocessing available: ', stdout)
- self.assertIn('using cloud sdk: ', stdout)
- self.assertIn('config path: ', stdout)
- self.assertIn('gsutil path: ', stdout)
- self.assertIn('compiled crcmod: ', stdout)
- self.assertIn('installed via package manager: ', stdout)
- self.assertIn('editable install: ', stdout)

Powered by Google App Engine
This is Rietveld 408576698