Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed leftover code related to ansible-core before 2.14 #382

Merged
merged 2 commits into from
May 22, 2024
Merged

Removed leftover code related to ansible-core before 2.14 #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee9f00e
Removed leftover code related to ansible-core before 2.14
ssbarnea May 22, 2024
191dc08
chore: auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/tox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ jobs:
uses: codecov/codecov-action@v4
with:
name: ${{ matrix.passed_name }}
# token: ${{ secrets.CODECOV_TOKEN }}
# verbose: true # optional (default = false)
fail_ci_if_error: true
use_oidc: true # cspell:ignore oidc
Expand Down
4 changes: 0 additions & 4 deletions src/ansible_compat/runtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
from ansible_compat.config import (
AnsibleConfig,
ansible_collections_path,
ansible_version,
parse_ansible_version,
)
from ansible_compat.constants import (
Expand Down Expand Up @@ -128,9 +127,6 @@ def __getattribute__(self, attr: str): # noqa: ANN204
try:
result = super().__getattribute__(attr)
except AttributeError as exc:
if ansible_version() < Version("2.14") and attr in {"filter", "test"}:
msg = "Ansible version below 2.14 does not support retrieving filter and test plugins."
raise RuntimeError(msg) from exc
proc = self.runtime.run(
["ansible-doc", "--json", "-l", "-t", attr],
)
Expand Down
42 changes: 12 additions & 30 deletions test/test_runtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import pytest
from packaging.version import Version

from ansible_compat.config import ansible_version
from ansible_compat.constants import INVALID_PREREQUISITES_RC
from ansible_compat.errors import (
AnsibleCommandError,
Expand Down Expand Up @@ -875,35 +874,18 @@ def test_runtime_plugins(runtime: Runtime) -> None:
assert isinstance(runtime.plugins.role, dict)
assert "become" in runtime.plugins.keyword

if ansible_version() < Version("2.14.0"):
assert "sudo" in runtime.plugins.become
assert "memory" in runtime.plugins.cache
assert "default" in runtime.plugins.callback
assert "local" in runtime.plugins.connection
assert "ini" in runtime.plugins.inventory
assert "env" in runtime.plugins.lookup
assert "sh" in runtime.plugins.shell
assert "host_group_vars" in runtime.plugins.vars
assert "file" in runtime.plugins.module
assert "free" in runtime.plugins.strategy
# ansible-doc below 2.14 does not support listing 'test' and 'filter' types:
with pytest.raises(RuntimeError):
assert "is_abs" in runtime.plugins.test
with pytest.raises(RuntimeError):
assert "bool" in runtime.plugins.filter
else:
assert "ansible.builtin.sudo" in runtime.plugins.become
assert "ansible.builtin.memory" in runtime.plugins.cache
assert "ansible.builtin.default" in runtime.plugins.callback
assert "ansible.builtin.local" in runtime.plugins.connection
assert "ansible.builtin.ini" in runtime.plugins.inventory
assert "ansible.builtin.env" in runtime.plugins.lookup
assert "ansible.builtin.sh" in runtime.plugins.shell
assert "ansible.builtin.host_group_vars" in runtime.plugins.vars
assert "ansible.builtin.file" in runtime.plugins.module
assert "ansible.builtin.free" in runtime.plugins.strategy
assert "ansible.builtin.is_abs" in runtime.plugins.test
assert "ansible.builtin.bool" in runtime.plugins.filter
assert "ansible.builtin.sudo" in runtime.plugins.become
assert "ansible.builtin.memory" in runtime.plugins.cache
assert "ansible.builtin.default" in runtime.plugins.callback
assert "ansible.builtin.local" in runtime.plugins.connection
assert "ansible.builtin.ini" in runtime.plugins.inventory
assert "ansible.builtin.env" in runtime.plugins.lookup
assert "ansible.builtin.sh" in runtime.plugins.shell
assert "ansible.builtin.host_group_vars" in runtime.plugins.vars
assert "ansible.builtin.file" in runtime.plugins.module
assert "ansible.builtin.free" in runtime.plugins.strategy
assert "ansible.builtin.is_abs" in runtime.plugins.test
assert "ansible.builtin.bool" in runtime.plugins.filter


@pytest.mark.parametrize(
Expand Down
Loading