fixes s3 fixture for s3 test complex

Author: andrewfulton9

zarr/storage.py

@@ -1113,9 +1113,7 @@ def rmdir(self, path=None):
             raise ReadOnlyError()
         store_path = self.dir_path(path)
         if self.fs.isdir(store_path):
-            # sometimes doesn't delete on first try with S3
-            while self.fs.exists(store_path):
-                self.fs.rm(store_path, recursive=True)
+            self.fs.rm(store_path, recursive=True)
 
     def getsize(self, path=None):
         store_path = self.dir_path(path)

zarr/tests/test_storage.py

@@ -1030,8 +1030,11 @@ def s3(request):
             pass
         timeout -= 0.1  # pragma: no cover
         time.sleep(0.1)  # pragma: no cover
-    s3so = dict(client_kwargs={'endpoint_url': endpoint_uri})
+    s3so = dict(client_kwargs={'endpoint_url': endpoint_uri},
+                use_listings_cache=False)
     s3 = s3fs.S3FileSystem(anon=False, **s3so)
+    if s3.exists("test"):
+        s3.rm("test", recursive=True)
     s3.mkdir("test")
     request.cls.s3so = s3so
     yield