From f92dd87333c1040a77504a76759eabc5f0db70a7 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Thu, 21 Sep 2023 21:27:34 +1100
Subject: [PATCH] Revert "fixture teardown should not fail test"

This reverts commit f0b2133083f4afa7e9c476db88f609843e304296.
---
 dev/tasks/conda-recipes/arrow-cpp/meta.yaml |  3 ++-
 python/pyarrow/tests/test_fs.py             | 10 ++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
index e90b7ccf8b5ee..44aa867594fdc 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
+++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -349,7 +349,8 @@ outputs:
         - fastparquet
         - fsspec
         - hypothesis
-        - minio-server
+        # currently disabled due to GH-37692
+        # - minio-server
         - pandas
         - s3fs >=2023
         - scipy
diff --git a/python/pyarrow/tests/test_fs.py b/python/pyarrow/tests/test_fs.py
index 7aae2754a74f6..8135f70f6905c 100644
--- a/python/pyarrow/tests/test_fs.py
+++ b/python/pyarrow/tests/test_fs.py
@@ -255,10 +255,7 @@ def s3fs(request, s3_server):
         allow_move_dir=False,
         allow_append_to_file=False,
     )
-    try:
-        fs.delete_dir(bucket)
-    except OSError:
-        pass
+    fs.delete_dir(bucket)
 
 
 @pytest.fixture
@@ -360,10 +357,7 @@ def py_fsspec_s3fs(request, s3_server):
         allow_move_dir=False,
         allow_append_to_file=True,
     )
-    try:
-        fs.delete_dir(bucket)
-    except OSError:
-        pass
+    fs.delete_dir(bucket)
 
 
 @pytest.fixture(params=[