Strip bucket on GdriveFileSystem (#6618)

dvc/fs/gdrive.py

@@ -296,6 +296,15 @@ def _with_bucket(self, path):
 
         return super()._with_bucket(path)
 
+    def _strip_bucket(self, entry):
+        try:
+            bucket, path = entry.split("/", 1)
+        except ValueError:
+            # If there is no path attached, only returns
+            # the bucket (top-level).
+            bucket, path = entry, None
+        return path or bucket
+
     def upload_fobj(self, fobj, to_info, **kwargs):
         rpath = self._with_bucket(to_info)
         self.makedirs(os.path.dirname(rpath))

tests/func/test_fs.py

@@ -493,9 +493,7 @@ def test_download_callback(tmp_dir, dvc, cloud):
                 os.name == "nt", reason="unsupported on Windows."
             ),
         ),
-        pytest.param(
-            pytest.lazy_fixture("gdrive"), marks=pytest.mark.xfail(strict=True)
-        ),
+        pytest.lazy_fixture("gdrive"),
     ],
 )
 def test_download_dir_callback(tmp_dir, dvc, cloud):