Skip to content

Commit

Permalink
Revert "fixture teardown should not fail test"
Browse files Browse the repository at this point in the history
This reverts commit f0b2133.
  • Loading branch information
h-vetinari committed Sep 21, 2023
1 parent d7af614 commit f92dd87
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
3 changes: 2 additions & 1 deletion dev/tasks/conda-recipes/arrow-cpp/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,8 @@ outputs:
- fastparquet
- fsspec
- hypothesis
- minio-server
# currently disabled due to GH-37692
# - minio-server
- pandas
- s3fs >=2023
- scipy
Expand Down
10 changes: 2 additions & 8 deletions python/pyarrow/tests/test_fs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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=[
Expand Down

0 comments on commit f92dd87

Please sign in to comment.