Remove the use of sh in tests

Author: bbc2

.github/workflows/test.yml

@@ -2,8 +2,6 @@ name: Run Tests
 
 on:
   push:
-    branches:
-      - main
   pull_request:
 
 concurrency:

tests/test_cli.py

@@ -1,6 +1,5 @@
 import os
 import subprocess
-import sys
 from pathlib import Path
 from typing import Optional, Sequence
 
@@ -10,9 +9,6 @@
 from dotenv.cli import cli as dotenv_cli
 from dotenv.version import __version__
 
-if sys.platform != "win32":
-    import sh
-
 
 def invoke_sub(args: Sequence[str]) -> subprocess.CompletedProcess:
     """
@@ -192,67 +188,93 @@ def test_set_no_file(cli):
     assert "Missing argument" in result.output
 
 
-@pytest.mark.skipif(sys.platform == "win32", reason="sh module doesn't support Windows")
 def test_get_default_path(tmp_path):
-    with sh.pushd(tmp_path):
-        (tmp_path / ".env").write_text("a=b")
+    (tmp_path / ".env").write_text("A=B")
 
-        result = sh.dotenv("get", "a")
+    result = subprocess.run(
+        ["dotenv", "get", "A"],
+        capture_output=True,
+        check=True,
+        cwd=tmp_path,
+        text=True,
+    )
 
-        assert result == "b\n"
+    assert result.stdout == "B\n"
 
 
-@pytest.mark.skipif(sys.platform == "win32", reason="sh module doesn't support Windows")
 def test_run(tmp_path):
-    with sh.pushd(tmp_path):
-        (tmp_path / ".env").write_text("a=b")
+    (tmp_path / ".env").write_text("A=B")
 
-        result = sh.dotenv("run", "printenv", "a")
+    result = subprocess.run(
+        ["dotenv", "run", "printenv", "A"],
+        capture_output=True,
+        check=True,
+        cwd=tmp_path,
+        text=True,
+    )
 
-        assert result == "b\n"
+    assert result.stdout == "B\n"
 
 
-@pytest.mark.skipif(sys.platform == "win32", reason="sh module doesn't support Windows")
 def test_run_with_existing_variable(tmp_path):
-    with sh.pushd(tmp_path):
-        (tmp_path / ".env").write_text("a=b")
-        env = dict(os.environ)
-        env.update({"LANG": "en_US.UTF-8", "a": "c"})
+    (tmp_path / ".env").write_text("A=B")
+    env = dict(os.environ)
+    env.update({"LANG": "en_US.UTF-8", "A": "C"})
 
-        result = sh.dotenv("run", "printenv", "a", _env=env)
+    result = subprocess.run(
+        ["dotenv", "run", "printenv", "A"],
+        capture_output=True,
+        check=True,
+        cwd=tmp_path,
+        text=True,
+        env=env,
+    )
 
-        assert result == "b\n"
+    assert result.stdout == "B\n"
 
 
-@pytest.mark.skipif(sys.platform == "win32", reason="sh module doesn't support Windows")
 def test_run_with_existing_variable_not_overridden(tmp_path):
-    with sh.pushd(tmp_path):
-        (tmp_path / ".env").write_text("a=b")
-        env = dict(os.environ)
-        env.update({"LANG": "en_US.UTF-8", "a": "c"})
+    (tmp_path / ".env").write_text("A=B")
+    env = dict(os.environ)
+    env.update({"LANG": "en_US.UTF-8", "A": "C"})
 
-        result = sh.dotenv("run", "--no-override", "printenv", "a", _env=env)
+    result = subprocess.run(
+        ["dotenv", "run", "--no-override", "printenv", "A"],
+        capture_output=True,
+        check=True,
+        cwd=tmp_path,
+        text=True,
+        env=env,
+    )
 
-        assert result == "c\n"
+    assert result.stdout == "C\n"
 
 
-@pytest.mark.skipif(sys.platform == "win32", reason="sh module doesn't support Windows")
 def test_run_with_none_value(tmp_path):
-    with sh.pushd(tmp_path):
-        (tmp_path / ".env").write_text("a=b\nc")
+    (tmp_path / ".env").write_text("A=B\nc")
 
-        result = sh.dotenv("run", "printenv", "a")
+    result = subprocess.run(
+        ["dotenv", "run", "printenv", "A"],
+        capture_output=True,
+        check=True,
+        cwd=tmp_path,
+        text=True,
+    )
 
-        assert result == "b\n"
+    assert result.stdout == "B\n"
 
 
-@pytest.mark.skipif(sys.platform == "win32", reason="sh module doesn't support Windows")
 def test_run_with_other_env(dotenv_path):
-    dotenv_path.write_text("a=b")
+    dotenv_path.write_text("A=B")
 
-    result = sh.dotenv("--file", dotenv_path, "run", "printenv", "a")
+    result = subprocess.run(
+        ["dotenv", "--file", dotenv_path, "run", "printenv", "A"],
+        capture_output=True,
+        check=True,
+        text=True,
+    )
 
-    assert result == "b\n"
+    assert result.stdout == "B\n"
 
 
 def test_run_without_cmd(cli):

tests/test_zip_imports.py

@@ -1,22 +1,18 @@
-import os
+import posixpath
+import subprocess
 import sys
 import textwrap
 from typing import List
 from unittest import mock
 from zipfile import ZipFile
 
-import pytest
-
-if sys.platform != "win32":
-    import sh
-
 
 def walk_to_root(path: str):
     last_dir = None
     current_dir = path
     while last_dir != current_dir:
         yield current_dir
-        (parent_dir, _) = os.path.split(current_dir)
+        parent_dir = posixpath.dirname(current_dir)
         last_dir, current_dir = current_dir, parent_dir
 
 
@@ -32,12 +28,11 @@ def setup_zipfile(path, files: List[FileToAdd]):
     with ZipFile(zip_file_path, "w") as zipfile:
         for f in files:
             zipfile.writestr(data=f.content, zinfo_or_arcname=f.path)
-            for dirname in walk_to_root(os.path.dirname(f.path)):
+            for dirname in walk_to_root(posixpath.dirname(f.path)):
                 if dirname not in dirs_init_py_added_to:
-                    print(os.path.join(dirname, "__init__.py"))
-                    zipfile.writestr(
-                        data="", zinfo_or_arcname=os.path.join(dirname, "__init__.py")
-                    )
+                    init_path = posixpath.join(dirname, "__init__.py")
+                    print(f"setup_zipfile: {init_path}")
+                    zipfile.writestr(data="", zinfo_or_arcname=init_path)
                     dirs_init_py_added_to.add(dirname)
     return zip_file_path
 
@@ -65,7 +60,6 @@ def test_load_dotenv_gracefully_handles_zip_imports_when_no_env_file(tmp_path):
     import child1.child2.test  # noqa
 
 
-@pytest.mark.skipif(sys.platform == "win32", reason="sh module doesn't support Windows")
 def test_load_dotenv_outside_zip_file_when_called_in_zipfile(tmp_path):
     zip_file_path = setup_zipfile(
         tmp_path,
@@ -83,24 +77,29 @@ def test_load_dotenv_outside_zip_file_when_called_in_zipfile(tmp_path):
         ],
     )
     dotenv_path = tmp_path / ".env"
-    dotenv_path.write_bytes(b"a=b")
+    dotenv_path.write_bytes(b"A=B")
     code_path = tmp_path / "code.py"
     code_path.write_text(
         textwrap.dedent(
             f"""
         import os
         import sys
 
-        sys.path.append("{zip_file_path}")
+        sys.path.append({str(zip_file_path)!r})
 
         import child1.child2.test
 
-        print(os.environ['a'])
+        print(os.environ['A'])
     """
         )
     )
-    os.chdir(str(tmp_path))
 
-    result = sh.Command(sys.executable)(code_path)
+    result = subprocess.run(
+        [sys.executable, str(code_path)],
+        capture_output=True,
+        check=True,
+        cwd=tmp_path,
+        text=True,
+    )
 
-    assert result == "b\n"
+    assert result.stdout == "B\n"