Fix failed tests test_attrs() and test_mkdir_with_path() (#479)

* test(core.py): replace HTTP method PATCH with PUT to update object metadata

* test(core.py): delete a line that does nothing

* test(core.py): partially fix "bucket name already exists" error for `test_mkdir_with_path`

* Revert "test(core.py): replace HTTP method PATCH with PUT to update object metadata"

This reverts commit 7a7a7d3.

* attempts

* attempt2

* fix condition

* skip instead

Co-authored-by: Martin Durant <martin.durant@alumni.utoronto.ca>

Author: shuuji3

gcsfs/core.py

@@ -642,7 +642,9 @@ async def _mkdir(
         if "/" in path and create_parents and await self._exists(bucket):
             # nothing to do
             return
-        if "/" in path and not create_parents and not await self._exists(bucket):
+        if "/" in path and not create_parents:
+            if await self._exists(bucket):
+                return
             raise FileNotFoundError(bucket)
 
         json_data = {"name": bucket}
@@ -798,6 +800,9 @@ async def _setxattrs(
     ):
         """Set/delete/add writable metadata attributes
 
+        Note: uses PATCH method (update), leaving unedited keys alone.
+        fake-gcs-server:latest does not seem to support this.
+
         Parameters
         ---------
         content_type: str
@@ -843,7 +848,6 @@ async def _setxattrs(
             json=i_json,
             json_out=True,
         )
-        (await self._info(path))["metadata"] = o_json.get("metadata", {})
         return o_json.get("metadata", {})
 
     setxattrs = sync_wrapper(_setxattrs)

gcsfs/tests/test_core.py

@@ -790,6 +790,9 @@ def test_array(gcs):
 
 
 def test_attrs(gcs):
+    if not gcs.on_google:
+        # https://github.com/fsspec/gcsfs/pull/479
+        pytest.skip("fake-gcs-server:latest only supports PUT for metadata, not PATCH")
     gcs.touch(a)
     assert "metadata" not in gcs.info(a)
     with pytest.raises(KeyError):
@@ -1070,12 +1073,15 @@ def test_dir_marker(gcs):
 
 
 def test_mkdir_with_path(gcs):
+
     with pytest.raises(FileNotFoundError):
-        gcs.mkdir("new/path", create_parents=False)
-    assert not gcs.exists("new")
-    gcs.mkdir("new/path", create_parents=True)
-    assert gcs.exists("new")
+        gcs.mkdir(f"{TEST_BUCKET + 'new'}/path", create_parents=False)
+    assert not gcs.exists(f"{TEST_BUCKET + 'new'}")
+    gcs.mkdir(f"{TEST_BUCKET + 'new'}/path", create_parents=True)
+    assert gcs.exists(f"{TEST_BUCKET + 'new'}")
 
     # these lines do nothing, but should not fail
-    gcs.mkdir("new/path", create_parents=False)
-    gcs.mkdir("new/path", create_parents=True)
+    gcs.mkdir(f"{TEST_BUCKET + 'new'}/path", create_parents=False)
+    gcs.mkdir(f"{TEST_BUCKET + 'new'}/path", create_parents=True)
+
+    gcs.rm(f"{TEST_BUCKET + 'new'}", recursive=True)