Move common logic into fixture

Author: ReubenFrankel

fsspec/tests/test_spec.py

@@ -1377,29 +1377,28 @@ def test_glob_posix_rules(path, expected, glob_fs):
         assert info == glob_fs[name]
 
 
-class CustomLocalFS(LocalFileSystem):
-    def ls(self, *args, **kwargs):
-        files = super().ls(*args, **kwargs)
-        limit = kwargs.pop("limit", None)
+@pytest.fixture(scope="function")
+def tmpfs(tmpdir):
+    get_files(tmpdir)
 
-        return files[:limit] if limit else files
+    class CustomLocalFS(LocalFileSystem):
+        def ls(self, *args, **kwargs):
+            files = super().ls(*args, **kwargs)
+            limit = kwargs.pop("limit", None)
 
+            return files[:limit] if limit else files
 
-def test_cat_wildcard_path_passthrough_kwargs_to_ls(tmpdir):
-    test_fs = CustomLocalFS()
-    get_files(tmpdir)
+    return CustomLocalFS(auto_mkdir=True)
 
-    file_contents = test_fs.cat(tmpdir / "*", limit=2)
 
+def test_cat_wildcard_path_passthrough_kwargs_to_ls(tmpfs, tmpdir):
+    file_contents = tmpfs.cat(tmpdir / "*", limit=2)
     assert len(file_contents) == 2
 
 
-def test_get_wildcard_path_passthrough_kwargs_to_ls(tmpdir):
-    test_fs = CustomLocalFS(auto_mkdir=True)
+def test_get_wildcard_path_passthrough_kwargs_to_ls(tmpfs, tmpdir):
     dest = tmpdir / "dest"
-    get_files(tmpdir)
-
-    test_fs.get(tmpdir / "*", str(dest), limit=2)
+    tmpfs.get(tmpdir / "*", str(dest), limit=2)
 
     assert len(dest.listdir()) == 2
 
@@ -1410,30 +1409,20 @@ def test_get_wildcard_path_passthrough_kwargs_to_ls(tmpdir):
         "implementation is not called"
     )
 )
-def test_put_wildcard_path_passthrough_kwargs_to_ls(tmpdir):
-    test_fs = CustomLocalFS(auto_mkdir=True)
+def test_put_wildcard_path_passthrough_kwargs_to_ls(tmpfs, tmpdir):
     dest = tmpdir / "dest"
-    get_files(tmpdir)
-
-    test_fs.put(tmpdir / "*", str(dest), limit=2)
+    tmpfs.put(tmpdir / "*", str(dest), limit=2)
 
     assert len(dest.listdir()) == 2
 
 
-def test_copy_wildcard_path_passthrough_kwargs_to_ls(tmpdir):
-    test_fs = CustomLocalFS(auto_mkdir=True)
+def test_copy_wildcard_path_passthrough_kwargs_to_ls(tmpfs, tmpdir):
     dest = tmpdir / "dest"
-    get_files(tmpdir)
-
-    test_fs.copy(tmpdir / "*", str(dest), limit=2)
+    tmpfs.copy(tmpdir / "*", str(dest), limit=2)
 
     assert len(dest.listdir()) == 2
 
 
-def test_expand_path_wildcard_path_passthrough_kwargs_to_ls(tmpdir):
-    test_fs = CustomLocalFS()
-    get_files(tmpdir)
-
-    expanded_paths = test_fs.expand_path(tmpdir / "*", limit=2)
-
+def test_expand_path_wildcard_path_passthrough_kwargs_to_ls(tmpfs, tmpdir):
+    expanded_paths = tmpfs.expand_path(tmpdir / "*", limit=2)
     assert len(expanded_paths) == 2