monkeyfs 0.2.4__tar.gz → 0.2.5__tar.gz

{monkeyfs-0.2.4 → monkeyfs-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monkeyfs
-Version: 0.2.4
+Version: 0.2.5
 Summary: Transparent filesystem interception via monkey-patching.
 Author: ashenfad
 License-Expression: MIT

{monkeyfs-0.2.4 → monkeyfs-0.2.5}/monkeyfs/virtual.py

@@ -536,6 +536,18 @@ class VirtualFS:
         """
         return dict(self._meta_all())
 
+    @staticmethod
+    def _absolute(normalized: str) -> str:
+        """A normalized key as an absolute path, for handing back to a
+        method that resolves its argument.
+
+        ``resolve_path`` returns the key form, which has no leading
+        slash; passed on as it is, the next method reads it as relative
+        to the working directory and names a different path whenever
+        that is not ``/``.
+        """
+        return "/" + normalized.strip("/")
+
     def _normalize_path(self, path: str) -> str:
         """Normalize file path for consistent internal keys.
 
@@ -1094,11 +1106,12 @@ class VirtualFS:
         if parent and not self.isdir("/" + parent):
             raise FileNotFoundError(f"No such file or directory: '{path}'")
 
-        # Check if already exists
-        absolute = "/" + normalized
-        if self.isfile(path):
+        # Check if already exists (on the absolute path: ``path`` is the
+        # key form, and checked as it is it would resolve a second time)
+        absolute = self._absolute(normalized)
+        if self.isfile(absolute):
             raise FileExistsError(errno.EEXIST, os.strerror(errno.EEXIST), absolute)
-        if self.isdir(path):
+        if self.isdir(absolute):
             if exist_ok:
                 return
             raise FileExistsError(errno.EEXIST, os.strerror(errno.EEXIST), absolute)
@@ -1130,8 +1143,8 @@ class VirtualFS:
         """
         path = self.resolve_path(path)
 
-        if not exist_ok and self.isdir(path):
-            absolute = "/" + path.strip("/")
+        if not exist_ok and self.isdir(self._absolute(path)):
+            absolute = self._absolute(path)
             raise FileExistsError(errno.EEXIST, os.strerror(errno.EEXIST), absolute)
 
         parts = path.strip("/").split("/")
@@ -1157,16 +1170,19 @@ class VirtualFS:
         """
         path = self.resolve_path(path)
         normalized = self._normalize_path(path)
-
-        if not self.exists(path):
-            raise FileNotFoundError(f"No such directory: {path}")
-        if self.isfile(path):
-            raise NotADirectoryError(f"Not a directory: {path}")
-        if not self.isdir(path):
-            raise FileNotFoundError(f"No such directory: {path}")
+        # Checked on the absolute path: ``path`` is the key form, and the
+        # checks resolve their argument again.
+        absolute = self._absolute(normalized)
+
+        if not self.exists(absolute):
+            raise FileNotFoundError(f"No such directory: {absolute}")
+        if self.isfile(absolute):
+            raise NotADirectoryError(f"Not a directory: {absolute}")
+        if not self.isdir(absolute):
+            raise FileNotFoundError(f"No such directory: {absolute}")
 
         # Check if directory is empty
-        children = self.list(path)
+        children = self.list(absolute)
         if children:
             raise OSError(f"Directory not empty: {path}")
 

{monkeyfs-0.2.4 → monkeyfs-0.2.5}/monkeyfs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monkeyfs
-Version: 0.2.4
+Version: 0.2.5
 Summary: Transparent filesystem interception via monkey-patching.
 Author: ashenfad
 License-Expression: MIT

{monkeyfs-0.2.4 → monkeyfs-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "monkeyfs"
-version = "0.2.4"
+version = "0.2.5"
 description = "Transparent filesystem interception via monkey-patching."
 readme = "README.md"
 license = "MIT"

{monkeyfs-0.2.4 → monkeyfs-0.2.5}/tests/test_directory_ops.py

@@ -514,3 +514,63 @@ def test_isolatedfs_recursive_listing_names_are_basenames(tmp_path):
         ("sub", "/probe/sub"),
         ("two.txt", "/probe/sub/two.txt"),
     ]
+
+
+# -- a working directory other than / (issue #30) -------------------------
+#
+# rmdir, mkdir and makedirs resolved a path, then handed the result (the
+# key form, with no leading slash) to checks that resolved it again,
+# relative to the working directory. From / the two resolutions agreed;
+# from anywhere else they named different paths.
+
+
+@pytest.fixture(params=["/", "/workspace", "/workspace/src"])
+def cwd_fs(request):
+    fs = VirtualFS({})
+    fs.makedirs("/workspace/src/inner", exist_ok=True)
+    fs.write("/workspace/f.txt", b"data")
+    fs.chdir(request.param)
+    return fs
+
+
+def test_rmdir_removes_an_empty_directory_from_any_cwd(cwd_fs):
+    cwd_fs.rmdir("/workspace/src/inner")
+    assert not cwd_fs.exists("/workspace/src/inner")
+
+
+def test_rmdir_refuses_a_missing_directory_by_its_absolute_path(cwd_fs):
+    with pytest.raises(FileNotFoundError, match="/workspace/nope"):
+        cwd_fs.rmdir("/workspace/nope")
+
+
+def test_rmdir_refuses_a_file_from_any_cwd(cwd_fs):
+    with pytest.raises(NotADirectoryError):
+        cwd_fs.rmdir("/workspace/f.txt")
+
+
+def test_mkdir_refuses_an_existing_directory_from_any_cwd(cwd_fs):
+    with pytest.raises(FileExistsError):
+        cwd_fs.mkdir("/workspace/src")
+
+
+def test_mkdir_refuses_an_existing_file_and_leaves_it_a_file(cwd_fs):
+    with pytest.raises(FileExistsError):
+        cwd_fs.mkdir("/workspace/f.txt")
+    assert cwd_fs.isfile("/workspace/f.txt")
+    assert not cwd_fs.isdir("/workspace/f.txt")
+    assert cwd_fs.read("/workspace/f.txt") == b"data"
+
+
+def test_makedirs_without_exist_ok_refuses_an_existing_directory(cwd_fs):
+    with pytest.raises(FileExistsError):
+        cwd_fs.makedirs("/workspace/src", exist_ok=False)
+
+
+def test_a_relative_rmdir_and_mkdir_resolve_against_the_cwd():
+    fs = VirtualFS({})
+    fs.makedirs("/workspace/src", exist_ok=True)
+    fs.chdir("/workspace")
+    fs.mkdir("new")
+    assert fs.isdir("/workspace/new")
+    fs.rmdir("src")
+    assert not fs.exists("/workspace/src")