Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion gcsfs/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -1963,12 +1963,16 @@ def _upload_chunk(self, final=False):
continue
else:
self.checker.update(data)
if final and contents:
j = json.loads(contents)
self.generation = j.get("generation")
else:
assert final, "Response looks like upload is over"
if l:
j = json.loads(contents)
self.checker.update(data)
self.checker.validate_json_response(j)
self.generation = j.get("generation")
# Clear buffer and update offset when all is received
self.buffer = UnclosableBytesIO()
self.offset += l
Expand Down Expand Up @@ -2014,7 +2018,7 @@ def _simple_upload(self):
"""One-shot upload, less than 5MB"""
self.buffer.seek(0)
data = self.buffer.read()
asyn.sync(
j = asyn.sync(
self.gcsfs.loop,
simple_upload,
self.gcsfs,
Expand All @@ -2029,6 +2033,7 @@ def _simple_upload(self):
kms_key_name=self.kms_key_name,
timeout=self.timeout,
)
self.generation = j.get("generation")

def _fetch_range(self, start=None, end=None):
"""Get data from GCS
Expand Down Expand Up @@ -2163,3 +2168,4 @@ async def simple_upload(
)
checker.update(datain)
checker.validate_json_response(j)
return j
16 changes: 16 additions & 0 deletions gcsfs/tests/test_core_versioned.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,19 @@ def test_find_versioned(gcs_versioned):
versions = {f"{a}#{v1}", f"{a}#{v2}"}
assert versions == set(gcs_versioned.find(a, versions=True))
assert versions == set(gcs_versioned.find(a, detail=True, versions=True))


def test_write_captures_generation(gcs_versioned):
with gcs_versioned.open(a, "wb") as wo:
wo.write(b"test content")
assert wo.generation is not None
assert wo.generation == gcs_versioned.info(a)["generation"]


def test_write_captures_generation_multipart(gcs_versioned):
with gcs_versioned.open(b, "wb") as wo:
wo.write(b"first chunk")
wo.flush()
wo.write(b"second chunk")
assert wo.generation is not None
assert wo.generation == gcs_versioned.info(b)["generation"]
Loading