1 files changed, 0 insertions, 57 deletions
diff --git a/net-misc/gsutil/files/gsutil-4.50-tests.patch b/net-misc/gsutil/files/gsutil-4.50-tests.patch
deleted file mode 100644
index 757f1f4ed4d5..000000000000
--- a/net-misc/gsutil/files/gsutil-4.50-tests.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/gslib/boto_translation.py b/gslib/boto_translation.py
-index 0af2e663..7d2f549f 100644
---- a/gslib/boto_translation.py
-+++ b/gslib/boto_translation.py
-@@ -1457,7 +1457,8 @@ class BotoTranslation(CloudApi):
-         # TODO: Define tags-related methods on storage_uri objects. In the
-         # meantime, we invoke the underlying bucket's methods directly.
-         try:
--          boto_tags = bucket_uri.get_bucket().get_tags()
-+          bucket = bucket_uri.get_bucket()
-+          boto_tags = bucket.get_tags() if hasattr(bucket, 'get_tags') else []
-           cloud_api_bucket.labels = (
-               LabelTranslation.BotoTagsToMessage(boto_tags))
-         except boto.exception.StorageResponseError as e:
-diff --git a/gslib/tests/test_naming.py b/gslib/tests/test_naming.py
-index d91cda04..6b44719f 100644
---- a/gslib/tests/test_naming.py
-+++ b/gslib/tests/test_naming.py
-@@ -36,6 +36,7 @@ from __future__ import unicode_literals
- 
- import gzip
- import os
-+import unittest 
- 
- import six
- 
-@@ -504,6 +505,7 @@ class GsutilNamingTests(testcase.GsUtilUnitTestCase):
-     self.assertEqual(1, len(actual))
-     self.assertEqual('/obj', actual[0].root_object.name)
- 
-+  @unittest.skip('test appears to be flakey')
-   def testCopyingCompressedFileToBucket(self):
-     """Tests copying one file with compression to a bucket."""
-     src_file = self.CreateTempFile(contents=b'plaintext', file_name='f2.txt')
-diff --git a/gslib/tests/testcase/unit_testcase.py b/gslib/tests/testcase/unit_testcase.py
-index b25352b6..c958f670 100644
---- a/gslib/tests/testcase/unit_testcase.py
-+++ b/gslib/tests/testcase/unit_testcase.py
-@@ -27,7 +27,6 @@ import tempfile
- import six
- 
- import boto
--from boto.utils import get_utf8able_str
- from gslib import project_id
- from gslib import wildcard_iterator
- from gslib.boto_translation import BotoTranslation
-@@ -157,8 +156,8 @@ class GsUtilUnitTestCase(base.GsUtilTestCase):
-         stderr = sys.stderr.buffer.read()
-     [six.ensure_text(string) for string in self.accumulated_stderr]
-     [six.ensure_text(string) for string in self.accumulated_stdout]
--    stdout = six.ensure_text(get_utf8able_str(stdout))
--    stderr = six.ensure_text(get_utf8able_str(stderr))
-+    stdout = six.ensure_text(six.ensure_str(stdout))
-+    stderr = six.ensure_text(six.ensure_str(stderr))
-     stdout += ''.join(self.accumulated_stdout)
-     stderr += ''.join(self.accumulated_stderr)
-     _AttemptToCloseSysFd(sys.stdout)