Fix unit tests

Author: dgarros

infrahub_sdk/ctl/check.py

@@ -88,7 +88,7 @@ async def run_check(
     format_json: bool,
     path: str,
     repository_config: InfrahubRepositoryConfig,
-    branch: Optional[str] = None,
+    branch: str | None = None,
     params: dict | None = None,
 ) -> bool:
     module_name = check_module.name
@@ -135,7 +135,7 @@ async def run_targeted_check(
     path: str,
     repository_config: InfrahubRepositoryConfig,
     variables: dict[str, str],
-    branch: Optional[str] = None,
+    branch: str | None = None,
 ) -> bool:
     filters = {}
     param_value = list(check_module.definition.parameters.values())
@@ -187,7 +187,7 @@ async def run_checks(
     path: str,
     variables: dict[str, str],
     repository_config: InfrahubRepositoryConfig,
-    branch: Optional[str] = None,
+    branch: str | None = None,
 ) -> None:
     log = logging.getLogger("infrahub")
 

tests/unit/ctl/test_cli.py

@@ -1,14 +1,10 @@
-import sys
 
-import pytest
 from typer.testing import CliRunner
 
 from infrahub_sdk.ctl.cli import app
 
 runner = CliRunner()
 
-requires_python_310 = pytest.mark.skipif(sys.version_info < (3, 10), reason="Requires Python 3.10 or higher")
-
 
 def test_main_app():
     result = runner.invoke(app, ["--help"])

tests/unit/ctl/test_repository_app.py

@@ -1,6 +1,5 @@
 """Integration tests for infrahubctl commands."""
 
-import sys
 from unittest import mock
 
 import pytest
@@ -13,8 +12,6 @@
 
 runner = CliRunner()
 
-requires_python_310 = pytest.mark.skipif(sys.version_info < (3, 10), reason="Requires Python 3.10 or higher")
-
 
 @pytest.fixture
 def mock_client() -> mock.Mock:
@@ -29,7 +26,6 @@ def mock_client() -> mock.Mock:
 class TestInfrahubctlRepository:
     """Groups the 'infrahubctl repository' test cases."""
 
-    @requires_python_310
     @mock.patch("infrahub_sdk.ctl.repository.initialize_client")
     def test_repo_no_username_or_password(self, mock_init_client, mock_client) -> None:
         """Case allow no username to be passed in and set it as None rather than blank string that fails."""
@@ -78,7 +74,6 @@ def test_repo_no_username_or_password(self, mock_init_client, mock_client) -> No
             tracker="mutation-repository-create",
         )
 
-    @requires_python_310
     @mock.patch("infrahub_sdk.ctl.repository.initialize_client")
     def test_repo_no_username(self, mock_init_client, mock_client) -> None:
         """Case allow no username to be passed in and set it as None rather than blank string that fails."""
@@ -139,7 +134,6 @@ def test_repo_no_username(self, mock_init_client, mock_client) -> None:
             tracker="mutation-repository-create",
         )
 
-    @requires_python_310
     @mock.patch("infrahub_sdk.ctl.repository.initialize_client")
     def test_repo_username(self, mock_init_client, mock_client) -> None:
         """Case allow no username to be passed in and set it as None rather than blank string that fails."""
@@ -202,7 +196,6 @@ def test_repo_username(self, mock_init_client, mock_client) -> None:
             tracker="mutation-repository-create",
         )
 
-    @requires_python_310
     @mock.patch("infrahub_sdk.ctl.repository.initialize_client")
     def test_repo_readonly_true(self, mock_init_client, mock_client) -> None:
         """Case allow no username to be passed in and set it as None rather than blank string that fails."""
@@ -264,7 +257,6 @@ def test_repo_readonly_true(self, mock_init_client, mock_client) -> None:
             tracker="mutation-repository-create",
         )
 
-    @requires_python_310
     @mock.patch("infrahub_sdk.ctl.repository.initialize_client")
     def test_repo_description_commit_branch(self, mock_init_client, mock_client) -> None:
         """Case allow no username to be passed in and set it as None rather than blank string that fails."""
@@ -333,9 +325,8 @@ def test_repo_description_commit_branch(self, mock_init_client, mock_client) ->
             tracker="mutation-repository-create",
         )
 
-    @requires_python_310
-    @mock.patch("infrahub_sdk.ctl.repository.initialize_client")
+    # @mock.patch("infrahub_sdk.ctl.repository.initialize_client")
     def test_repo_list(self, mock_repositories_list) -> None:
         result = runner.invoke(app, ["repository", "list", "--branch", "main"])
-        assert result.exit_code == 0
         assert strip_color(result.stdout) == read_fixture("output.txt", "integration/test_infrahubctl/repository_list")
+        assert result.exit_code == 0

tests/unit/ctl/test_validate_app.py

@@ -1,4 +1,3 @@
-import sys
 
 import pytest
 from typer.testing import CliRunner
@@ -9,10 +8,7 @@
 
 runner = CliRunner()
 
-requires_python_310 = pytest.mark.skipif(sys.version_info < (3, 10), reason="Requires Python 3.10 or higher")
 
-
-@requires_python_310
 def test_validate_schema_valid():
     fixture_file = get_fixtures_dir() / "models" / "valid_model_01.json"
 
@@ -21,7 +17,6 @@ def test_validate_schema_valid():
     assert "Schema is valid" in result.stdout
 
 
-@requires_python_310
 def test_validate_schema_empty():
     fixture_file = get_fixtures_dir() / "models" / "empty.json"
 
@@ -30,7 +25,6 @@ def test_validate_schema_empty():
     assert "Empty YAML/JSON file" in remove_ansi_color(result.stdout)
 
 
-@requires_python_310
 def test_validate_schema_non_valid():
     fixture_file = get_fixtures_dir() / "models" / "non_valid_model_01.json"