Skip to content

Commit 3c3cd41

Browse files
authored
re-enable all tests in CI (#940)
1 parent 023aecf commit 3c3cd41

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
4545
- name: Run Tests
4646
shell: bash -l {0}
47-
run: pytest -vv -s s3fs -k test_write_blocks
47+
run: pytest -vv -s s3fs
4848

4949

5050
pre-commit:

s3fs/tests/derived/s3fs_test.py

+13-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,20 @@ class TestS3fsPut(abstract.AbstractPutTests, S3fsFixtures):
1616
pass
1717

1818

19+
def botocore_too_old():
20+
import botocore
21+
from packaging.version import parse
22+
23+
MIN_BOTOCORE_VERSION = "1.33.2"
24+
25+
return parse(botocore.__version__) < parse(MIN_BOTOCORE_VERSION)
26+
27+
1928
class TestS3fsPipe(abstract.AbstractPipeTests, S3fsFixtures):
20-
pass
29+
30+
test_pipe_exclusive = pytest.mark.skipif(
31+
botocore_too_old(), reason="Older botocore doesn't support exclusive writes"
32+
)(abstract.AbstractPipeTests.test_pipe_exclusive)
2133

2234

2335
class TestS3fsOpen(abstract.AbstractOpenTests, S3fsFixtures):

s3fs/tests/test_s3fs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ def test_info(s3):
269269
info.pop("ContentType")
270270
linfo.pop("Key")
271271
linfo.pop("Size")
272-
linfo.pop("ChecksumAlgorithm")
272+
linfo.pop("ChecksumAlgorithm", None) # field DNE in some S3-compatible providers
273273
assert info == linfo
274274
parent = a.rsplit("/", 1)[0]
275275
s3.invalidate_cache() # remove full path from the cache

0 commit comments

Comments
 (0)