diff options
Diffstat (limited to 'debian/patches/deb-testing.patch')
| -rw-r--r-- | debian/patches/deb-testing.patch | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/debian/patches/deb-testing.patch b/debian/patches/deb-testing.patch index 7556c4f..52aaf42 100644 --- a/debian/patches/deb-testing.patch +++ b/debian/patches/deb-testing.patch @@ -1,18 +1,20 @@ Author: Michael R. Crusoe <crusoe@debian.org> Description: Debian-specific changes for running the tests offline during the build Forwarded: not-needed +Index: ansible-lint/conftest.py +=================================================================== --- ansible-lint.orig/conftest.py +++ ansible-lint/conftest.py -@@ -15,7 +15,7 @@ - +@@ -17,7 +17,7 @@ if Path.cwd() != Path(__file__).parent: # checking if user is running pytest without installing test dependencies: - missing = [] --for module in ["ansible", "black", "mypy", "pylint"]: -+for module in ["ansible", "black"]: - if not importlib.util.find_spec(module): - missing.append(module) + missing = [ + module +- for module in ["ansible", "black", "mypy", "pylint"] ++ for module in ["ansible", "black"] + if not importlib.util.find_spec(module) + ] if missing: -@@ -30,18 +30,6 @@ +@@ -32,18 +32,6 @@ def pytest_configure(config: pytest.Conf """Ensure we run preparation only on master thread when running in parallel.""" if is_help_option_present(config): return @@ -31,21 +33,17 @@ Forwarded: not-needed def is_help_option_present(config: pytest.Config) -> bool: +Index: ansible-lint/test/test_schemas.py +=================================================================== --- ansible-lint.orig/test/test_schemas.py +++ ansible-lint/test/test_schemas.py -@@ -10,7 +10,6 @@ - from unittest.mock import DEFAULT, MagicMock, patch - - import pytest --import spdx.config - - from ansiblelint.file_utils import Lintable - from ansiblelint.schemas import __file__ as schema_module -@@ -18,7 +17,6 @@ +@@ -20,9 +20,6 @@ from ansiblelint.schemas.__main__ import from ansiblelint.schemas.main import validate_file_schema schema_path = Path(schema_module).parent --spdx_config_path = Path(spdx.config.__file__).parent +-spdx_config_path = ( +- Path(license_expression.__file__).parent / "data" / "scancode-licensedb-index.json" +-) - def test_refresh_schemas() -> None: + def urlopen_side_effect(*_args: Any, **kwargs: Any) -> DEFAULT: |