tests: add fs related tests (#18)

Author: skshetry

scmrepo/fs.py

@@ -80,6 +80,9 @@ def _open(
         cache_options: Dict = None,
         **kwargs: Any,
     ) -> BinaryIO:
+        if mode != "rb":
+            raise NotImplementedError
+
         key = self._get_key(path)
         try:
             obj = self.trie.open(key, mode=mode)

tests/conftest.py

@@ -79,8 +79,7 @@ def docker(request: pytest.FixtureRequest):
     for cmd in [("docker", "ps"), ("docker-compose", "version")]:
         try:
             subprocess.call(
-                cmd,
-                shell=True,
+                " ".join(cmd),
                 stderr=subprocess.DEVNULL,
                 stdout=subprocess.DEVNULL,
             )

tests/test_dulwich.py

@@ -1,4 +1,3 @@
-import os
 import socket
 import threading
 from io import StringIO
@@ -13,6 +12,7 @@
     USER,
     Server,
 )
+from funcy import retry
 from pytest_mock import MockerFixture
 
 from scmrepo.git.backend.dulwich.asyncssh_vendor import AsyncSSHVendor
@@ -89,7 +89,6 @@ def test_run_command_with_privkey(server: Server, ssh_port: int):
     assert b"test_run_command_with_privkey" in server.commands
 
 
-@pytest.mark.xfail("CI" in os.environ, reason="failing in CI")
 def test_run_command_data_transfer(server: Server, ssh_port: int):
     vendor = AsyncSSHVendor()
     con = vendor.run_command(
@@ -107,7 +106,13 @@ def test_run_command_data_transfer(server: Server, ssh_port: int):
     channel.send_stderr(b"stderr\n")
     channel.close()
 
-    assert con.can_read()
+    def check_can_read():
+        assert con.can_read()
+        return True
+
+    # pylint: disable=no-value-for-parameter
+    can_read = retry(10, timeout=0.1)(check_can_read)
+    assert can_read()
     assert con.read(4096) == b"stdout\n"
     assert con.read_stderr(4096) == b"stderr\n"
 

tests/test_fs.py

@@ -0,0 +1,146 @@
+import os
+
+import pytest
+from pytest_test_utils import TmpDir
+
+from scmrepo.git import Git
+
+
+def test_open(tmp_dir: TmpDir, scm: Git):
+    files = tmp_dir.gen(
+        {"foo": "foo", "тест": "проверка", "data": {"lorem": "ipsum"}}
+    )
+    scm.add_commit(files, message="add")
+
+    fs = scm.get_fs("master")
+    with fs.open("foo", mode="r", encoding="utf-8") as fobj:
+        assert fobj.read() == "foo"
+    with fs.open("тест", mode="r", encoding="utf-8") as fobj:
+        assert fobj.read() == "проверка"
+    with pytest.raises(IOError):
+        fs.open("not-existing-file")
+    with pytest.raises(IOError):
+        fs.open("data")
+
+
+def test_exists(tmp_dir: TmpDir, scm: Git):
+    scm.commit("init")
+    files = tmp_dir.gen(
+        {"foo": "foo", "тест": "проверка", "data": {"lorem": "ipsum"}}
+    )
+
+    fs = scm.get_fs("master")
+
+    assert not fs.exists("foo")
+    assert not fs.exists("тест")
+    assert not fs.exists("data")
+    assert not fs.exists(os.path.join("data", "lorem"))
+
+    scm.add_commit(files, message="add")
+
+    fs = scm.get_fs("master")
+    assert fs.exists("foo")
+    assert fs.exists("тест")
+    assert fs.exists("data")
+    assert fs.exists(os.path.join("data", "lorem"))
+    assert not fs.exists("non-existing-file")
+
+
+def test_isdir(tmp_dir: TmpDir, scm: Git):
+    tmp_dir.gen({"foo": "foo", "тест": "проверка", "data": {"lorem": "ipsum"}})
+    scm.add_commit(["foo", "data"], message="add")
+
+    fs = scm.get_fs("master")
+
+    assert fs.isdir("data")
+    assert not fs.isdir("foo")
+    assert not fs.isdir("non-existing-file")
+
+
+def test_isfile(tmp_dir: TmpDir, scm: Git):
+    tmp_dir.gen({"foo": "foo", "тест": "проверка", "data": {"lorem": "ipsum"}})
+    scm.add_commit(["foo", "data"], message="add")
+
+    fs = scm.get_fs("master")
+    assert fs.isfile("foo")
+    assert not fs.isfile("data")
+    assert not fs.isfile("not-existing-file")
+
+
+def test_walk(tmp_dir: TmpDir, scm: Git):
+    tmp_dir.gen(
+        {
+            "foo": "foo",
+            "тест": "проверка",
+            "data": {"lorem": "ipsum", "subdir": {"sub": "sub"}},
+        }
+    )
+    scm.add_commit(os.path.join("data", "subdir"), message="add")
+    fs = scm.get_fs("master")
+
+    def convert_to_sets(walk_results):
+        return [
+            (root, set(dirs), set(nondirs))
+            for root, dirs, nondirs in walk_results
+        ]
+
+    assert convert_to_sets(fs.walk(".")) == convert_to_sets(
+        [
+            (scm.root_dir, ["data"], []),
+            (os.path.join(scm.root_dir, "data"), ["subdir"], []),
+            (
+                os.path.join(scm.root_dir, "data", "subdir"),
+                [],
+                ["sub"],
+            ),
+        ]
+    )
+
+    assert convert_to_sets(
+        fs.walk(os.path.join("data", "subdir"))
+    ) == convert_to_sets(
+        [
+            (
+                os.path.join(scm.root_dir, "data", "subdir"),
+                [],
+                ["sub"],
+            )
+        ]
+    )
+
+
+def test_ls(tmp_dir: TmpDir, scm: Git):
+    files = tmp_dir.gen(
+        {
+            "foo": "foo",
+            "тест": "проверка",
+            "data": {"lorem": "ipsum", "subdir": {"sub": "sub"}},
+        }
+    )
+    scm.add_commit(files, message="add")
+    fs = scm.get_fs("master")
+
+    assert fs.ls(".", detail=False) == ["foo", "тест", "data"]
+    assert fs.ls(".") == {
+        "data": {
+            "mode": 16384,
+            "name": str(tmp_dir / "data"),
+            "sha": "f5d6ac1955c85410b71bb6e35e4c57c54e2ad524",
+            "size": 66,
+            "type": "directory",
+        },
+        "foo": {
+            "mode": 33188,
+            "name": str(tmp_dir / "foo"),
+            "sha": "19102815663d23f8b75a47e7a01965dcdc96468c",
+            "size": 3,
+            "type": "file",
+        },
+        "тест": {
+            "mode": 33188,
+            "name": str(tmp_dir / "тест"),
+            "sha": "eeeba1738f4c12844163b89112070c6e57eb764e",
+            "size": 16,
+            "type": "file",
+        },
+    }