tests: work around failures under Python 2.7

See: googleapis/python-test-utils#36

Author: tseaver

tests/system/test_bucket.py

@@ -21,6 +21,14 @@
 from test_utils.retry import RetryErrors
 from . import _helpers
 
+# Work around https://github.com/googleapis/python-test-utils/issues/36
+if six.PY3:
+    retry_failures = RetryErrors(AssertionError)
+else:
+
+    def retry_failures(decorated):  # no-op
+        return decorated
+
 
 def test_bucket_create_w_alt_storage_class(storage_client, buckets_to_delete):
     from google.cloud.storage import constants
@@ -369,13 +377,13 @@ def test_bucket_get_blob_with_user_project(
     assert found.download_as_bytes() == payload
 
 
-@RetryErrors(AssertionError)
+@retry_failures
 def test_bucket_list_blobs(listable_bucket, listable_filenames):
     all_blobs = list(listable_bucket.list_blobs())
     assert sorted(blob.name for blob in all_blobs) == sorted(listable_filenames)
 
 
-@RetryErrors(AssertionError)
+@retry_failures
 def test_bucket_list_blobs_w_user_project(
     storage_client, listable_bucket, listable_filenames, user_project,
 ):
@@ -386,7 +394,7 @@ def test_bucket_list_blobs_w_user_project(
     assert sorted(blob.name for blob in all_blobs) == sorted(listable_filenames)
 
 
-@RetryErrors(AssertionError)
+@retry_failures
 def test_bucket_list_blobs_paginated(listable_bucket, listable_filenames):
     truncation_size = 1
     count = len(listable_filenames) - truncation_size
@@ -408,7 +416,7 @@ def test_bucket_list_blobs_paginated(listable_bucket, listable_filenames):
     assert len(last_blobs) == truncation_size
 
 
-@RetryErrors(AssertionError)
+@retry_failures
 def test_bucket_list_blobs_paginated_w_offset(listable_bucket, listable_filenames):
     truncation_size = 1
     inclusive_start_offset = listable_filenames[1]
@@ -439,15 +447,15 @@ def test_bucket_list_blobs_paginated_w_offset(listable_bucket, listable_filename
     assert last_blobs[-1].name == desired_files[-1]
 
 
-@RetryErrors(AssertionError)
+@retry_failures
 def test_blob_exists_hierarchy(hierarchy_bucket, hierarchy_filenames):
     for filename in hierarchy_filenames:
         blob = hierarchy_bucket.blob(filename)
         assert blob.exists()
 
 
-@RetryErrors(AssertionError)
-def test_list_blobs_hierarchy_root_level(hierarchy_bucket, hierarchy_filenames):
+@retry_failures
+def test_bucket_list_blobs_hierarchy_root_level(hierarchy_bucket, hierarchy_filenames):
     expected_names = ["file01.txt"]
     expected_prefixes = set(["parent/"])
 
@@ -460,8 +468,8 @@ def test_list_blobs_hierarchy_root_level(hierarchy_bucket, hierarchy_filenames):
     assert iterator.prefixes == expected_prefixes
 
 
-@RetryErrors(AssertionError)
-def test_list_blobs_hierarchy_first_level(hierarchy_bucket, hierarchy_filenames):
+@retry_failures
+def test_bucket_list_blobs_hierarchy_first_level(hierarchy_bucket, hierarchy_filenames):
     expected_names = ["parent/", "parent/file11.txt"]
     expected_prefixes = set(["parent/child/"])
 
@@ -474,8 +482,10 @@ def test_list_blobs_hierarchy_first_level(hierarchy_bucket, hierarchy_filenames)
     assert iterator.prefixes == expected_prefixes
 
 
-@RetryErrors(AssertionError)
-def test_list_blobs_hierarchy_second_level(hierarchy_bucket, hierarchy_filenames):
+@retry_failures
+def test_bucket_list_blobs_hierarchy_second_level(
+    hierarchy_bucket, hierarchy_filenames
+):
     expected_names = ["parent/child/file21.txt", "parent/child/file22.txt"]
     expected_prefixes = set(["parent/child/grand/", "parent/child/other/"])
 
@@ -487,8 +497,8 @@ def test_list_blobs_hierarchy_second_level(hierarchy_bucket, hierarchy_filenames
     assert iterator.prefixes == expected_prefixes
 
 
-@RetryErrors(AssertionError)
-def test_list_blobs_hierarchy_third_level(hierarchy_bucket, hierarchy_filenames):
+@retry_failures
+def test_bucket_list_blobs_hierarchy_third_level(hierarchy_bucket, hierarchy_filenames):
     # Pseudo-hierarchy can be arbitrarily deep, subject to the limit
     # of 1024 characters in the UTF-8 encoded name:
     # https://cloud.google.com/storage/docs/bucketnaming#objectnames
@@ -505,8 +515,8 @@ def test_list_blobs_hierarchy_third_level(hierarchy_bucket, hierarchy_filenames)
     assert iterator.prefixes == expected_prefixes
 
 
-@RetryErrors(AssertionError)
-def test_list_blobs_hierarchy_w_include_trailing_delimiter(
+@retry_failures
+def test_bucket_list_blobs_hierarchy_w_include_trailing_delimiter(
     hierarchy_bucket, hierarchy_filenames,
 ):
     expected_names = ["file01.txt", "parent/"]