Skip to content

Commit 005d1de

Browse files
authored
test CI (fsspec#922)
1 parent 7dd0e36 commit 005d1de

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
4646
- name: Run Tests
4747
shell: bash -l {0}
48-
run: pytest -vv s3fs
48+
run: pytest -vv -s s3fs -k test_write_blocks
4949

5050

5151
pre-commit:

s3fs/core.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -2395,7 +2395,9 @@ def upload_part(part_data: bytes):
23952395
if len(part_data) == 0:
23962396
return
23972397
part = len(self.parts) + 1
2398-
logger.debug("Upload chunk %s, %s" % (self, part))
2398+
logger.debug(
2399+
"Upload chunk %s, %s; %s bytes" % (self, part, len(part_data))
2400+
)
23992401

24002402
out = self._call_s3(
24012403
"upload_part",

s3fs/tests/test_s3fs.py

+11-5
Original file line numberDiff line numberDiff line change
@@ -1287,10 +1287,10 @@ def test_write_blocks(s3):
12871287
assert f.mpu
12881288
assert f.parts
12891289
assert s3.info(test_bucket_name + "/temp")["size"] == 6 * 2**20
1290-
with s3.open(test_bucket_name + "/temp", "wb", block_size=10 * 2**20) as f:
1290+
with s3.open(test_bucket_name + "/temp2", "wb", block_size=10 * 2**20) as f:
12911291
f.write(b"a" * 15 * 2**20)
12921292
assert f.buffer.tell() == 0
1293-
assert s3.info(test_bucket_name + "/temp")["size"] == 15 * 2**20
1293+
assert s3.info(test_bucket_name + "/temp2")["size"] == 15 * 2**20
12941294

12951295

12961296
def test_readline(s3):
@@ -1406,21 +1406,27 @@ def test_append(s3):
14061406
f.write(b"a" * 10 * 2**20)
14071407
with s3.open(a, "ab") as f:
14081408
pass # append, no write, big file
1409-
assert s3.cat(a) == b"a" * 10 * 2**20
1409+
data = s3.cat(a)
1410+
assert len(data) == 10 * 2**20 and set(data) == set(b"a")
14101411

14111412
with s3.open(a, "ab") as f:
14121413
assert f.parts is None
14131414
f._initiate_upload()
14141415
assert f.parts
14151416
assert f.tell() == 10 * 2**20
14161417
f.write(b"extra") # append, small write, big file
1417-
assert s3.cat(a) == b"a" * 10 * 2**20 + b"extra"
1418+
data = s3.cat(a)
1419+
assert len(data) == 10 * 2**20 + len(b"extra")
1420+
assert data[-5:] == b"extra"
14181421

14191422
with s3.open(a, "ab") as f:
14201423
assert f.tell() == 10 * 2**20 + 5
14211424
f.write(b"b" * 10 * 2**20) # append, big write, big file
14221425
assert f.tell() == 20 * 2**20 + 5
1423-
assert s3.cat(a) == b"a" * 10 * 2**20 + b"extra" + b"b" * 10 * 2**20
1426+
data = s3.cat(a)
1427+
assert len(data) == 10 * 2**20 + len(b"extra") + 10 * 2**20
1428+
assert data[10 * 2**20 : 10 * 2**20 + 5] == b"extra"
1429+
assert set(data[-10 * 2**20 :]) == set(b"b")
14241430

14251431
# Keep Head Metadata
14261432
head = dict(

0 commit comments

Comments
 (0)