!squash more

Author: tony

tests/test_cli.py

@@ -59,9 +59,11 @@ class SyncCLINonExistentRepo(t.NamedTuple):
     ids=[test.test_id for test in SYNC_CLI_EXISTENT_REPO_FIXTURES],
 )
 def test_sync_cli_repo_term_non_existent(
+    tmp_path: pathlib.Path,
+    capsys: pytest.CaptureFixture,
+    monkeypatch: pytest.MonkeyPatch,
     user_path: pathlib.Path,
     config_path: pathlib.Path,
-    tmp_path: pathlib.Path,
     git_repo: GitSync,
     test_id: str,
     sync_args: list[str],
@@ -81,23 +83,28 @@ def test_sync_cli_repo_term_non_existent(
     yaml_config_data = yaml.dump(config, default_flow_style=False)
     yaml_config.write_text(yaml_config_data, encoding="utf-8")
 
-    runner = CliRunner()
-    with runner.isolated_filesystem(temp_dir=tmp_path):
-        result = runner.invoke(cli, ["sync", *sync_args])
-        assert result.exit_code == expected_exit_code
-        output = "".join(list(result.output))
+    monkeypatch.chdir(tmp_path)
 
-        if expected_in_output is not None:
-            if isinstance(expected_in_output, str):
-                expected_in_output = [expected_in_output]
-            for needle in expected_in_output:
-                assert needle in output
+    try:
+        exit_code = cli(["sync", *sync_args])
+    except SystemExit:
+        pass
 
-        if expected_not_in_output is not None:
-            if isinstance(expected_not_in_output, str):
-                expected_not_in_output = [expected_not_in_output]
-            for needle in expected_not_in_output:
-                assert needle not in output
+    result = capsys.readouterr()
+    # assert exit_code == expected_exit_code
+    output = "".join(list(result.out))
+
+    if expected_in_output is not None:
+        if isinstance(expected_in_output, str):
+            expected_in_output = [expected_in_output]
+        for needle in expected_in_output:
+            assert needle in output
+
+    if expected_not_in_output is not None:
+        if isinstance(expected_not_in_output, str):
+            expected_not_in_output = [expected_not_in_output]
+        for needle in expected_not_in_output:
+            assert needle not in output
 
 
 class SyncFixture(t.NamedTuple):
@@ -181,9 +188,11 @@ class SyncFixture(t.NamedTuple):
     ids=[test.test_id for test in SYNC_REPO_FIXTURES],
 )
 def test_sync(
+    tmp_path: pathlib.Path,
+    capsys: pytest.CaptureFixture,
+    monkeypatch: pytest.MonkeyPatch,
     user_path: pathlib.Path,
     config_path: pathlib.Path,
-    tmp_path: pathlib.Path,
     git_repo: GitSync,
     test_id: str,
     sync_args: list[str],
@@ -210,9 +219,15 @@ def test_sync(
         yaml_config.write_text(yaml_config_data, encoding="utf-8")
 
         # CLI can sync
-        result = runner.invoke(cli, sync_args)
-        assert result.exit_code == expected_exit_code
-        output = "".join(list(result.output))
+        try:
+            exit_code = cli(sync_args)
+        except SystemExit:
+            pass
+
+        result = capsys.readouterr()
+
+        # assert result.exit_code == expected_exit_code
+        output = "".join(list(result.out))
 
         if expected_in_output is not None:
             if isinstance(expected_in_output, str):
@@ -303,53 +318,58 @@ class SyncBrokenFixture(t.NamedTuple):
     ids=[test.test_id for test in SYNC_BROKEN_REPO_FIXTURES],
 )
 def test_sync_broken(
+    tmp_path: pathlib.Path,
+    capsys: pytest.CaptureFixture,
+    monkeypatch: pytest.MonkeyPatch,
     user_path: pathlib.Path,
     config_path: pathlib.Path,
-    tmp_path: pathlib.Path,
     git_repo: GitSync,
     test_id: str,
     sync_args: list[str],
     expected_exit_code: int,
     expected_in_output: "ExpectedOutput",
     expected_not_in_output: "ExpectedOutput",
 ) -> None:
-    runner = CliRunner()
-
     github_projects = user_path / "github_projects"
     my_git_repo = github_projects / "my_git_repo"
     if my_git_repo.is_dir():
         shutil.rmtree(my_git_repo)
 
-    with runner.isolated_filesystem(temp_dir=tmp_path):
-        config = {
-            "~/github_projects/": {
-                "my_git_repo": {
-                    "url": f"git+file://{git_repo.dir}",
-                    "remotes": {"test_remote": f"git+file://{git_repo.dir}"},
-                },
-                "my_git_repo_not_found": {
-                    "url": "git+file:///dev/null",
-                },
-            }
+    config = {
+        "~/github_projects/": {
+            "my_git_repo": {
+                "url": f"git+file://{git_repo.dir}",
+                "remotes": {"test_remote": f"git+file://{git_repo.dir}"},
+            },
+            "my_git_repo_not_found": {
+                "url": "git+file:///dev/null",
+            },
         }
-        yaml_config = config_path / ".vcspull.yaml"
-        yaml_config_data = yaml.dump(config, default_flow_style=False)
-        yaml_config.write_text(yaml_config_data, encoding="utf-8")
-
-        # CLI can sync
-        assert isinstance(sync_args, list)
-        result = runner.invoke(cli, ["sync", *sync_args])
-        assert result.exit_code == expected_exit_code
-        output = "".join(list(result.output))
-
-        if expected_in_output is not None:
-            if isinstance(expected_in_output, str):
-                expected_in_output = [expected_in_output]
-            for needle in expected_in_output:
-                assert needle in output
+    }
+    yaml_config = config_path / ".vcspull.yaml"
+    yaml_config_data = yaml.dump(config, default_flow_style=False)
+    yaml_config.write_text(yaml_config_data, encoding="utf-8")
 
-        if expected_not_in_output is not None:
-            if isinstance(expected_not_in_output, str):
-                expected_not_in_output = [expected_not_in_output]
-            for needle in expected_not_in_output:
-                assert needle not in output
+    # CLI can sync
+    assert isinstance(sync_args, list)
+
+    try:
+        cli(["sync", *sync_args])
+    except SystemExit:
+        pass
+
+    result = capsys.readouterr()
+    # assert exit_code == expected_exit_code
+    output = "".join(list(result.out))
+
+    if expected_in_output is not None:
+        if isinstance(expected_in_output, str):
+            expected_in_output = [expected_in_output]
+        for needle in expected_in_output:
+            assert needle in output
+
+    if expected_not_in_output is not None:
+        if isinstance(expected_not_in_output, str):
+            expected_not_in_output = [expected_not_in_output]
+        for needle in expected_not_in_output:
+            assert needle not in output