Roll version of gsutil to 4.15.

third_party/gsutil/gslib/tests/test_Doption.py

 # -*- 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 platform
+
 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.')
@@ skipping 52 matching lines @@
       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))
+          stderr, '.*GET.*b/%s/o/%s.*user-agent:.*gsutil/%s.Python/%s' %
+          (key_uri.bucket_name, key_uri.object_name, gslib.VERSION,
+           platform.python_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)