diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-05 16:18:41 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-05 16:18:41 +0000 |
| commit | b643c52cf29ce5bbab738b43290af3556efa1ca9 (patch) | |
| tree | 21d5c53d7a9b696627a255777cefdf6f78968824 /ansible_collections/cloud/common/tests | |
| parent | Releasing progress-linux version 9.5.1+dfsg-1~progress7.99u1. (diff) | |
| download | ansible-b643c52cf29ce5bbab738b43290af3556efa1ca9.tar.xz ansible-b643c52cf29ce5bbab738b43290af3556efa1ca9.zip | |
Merging upstream version 10.0.0+dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ansible_collections/cloud/common/tests')
5 files changed, 13 insertions, 12 deletions
diff --git a/ansible_collections/cloud/common/tests/config.yml b/ansible_collections/cloud/common/tests/config.yml index faff92e33..05012468b 100644 --- a/ansible_collections/cloud/common/tests/config.yml +++ b/ansible_collections/cloud/common/tests/config.yml @@ -1,2 +1,2 @@ modules: - python_requires: '>=3.6' + python_requires: '>=3.9' diff --git a/ansible_collections/cloud/common/tests/sanity/ignore-2.17.txt b/ansible_collections/cloud/common/tests/sanity/ignore-2.17.txt new file mode 100644 index 000000000..e7b94a256 --- /dev/null +++ b/ansible_collections/cloud/common/tests/sanity/ignore-2.17.txt @@ -0,0 +1 @@ +plugins/module_utils/turbo/server.py pylint:ansible-bad-module-import diff --git a/ansible_collections/cloud/common/tests/unit/plugins/module_utils/turbo/conftest.py b/ansible_collections/cloud/common/tests/unit/plugins/module_utils/turbo/conftest.py index 8f8f44e78..0b7006b27 100644 --- a/ansible_collections/cloud/common/tests/unit/plugins/module_utils/turbo/conftest.py +++ b/ansible_collections/cloud/common/tests/unit/plugins/module_utils/turbo/conftest.py @@ -6,7 +6,6 @@ import json import pytest - from ansible.module_utils import basic from ansible.module_utils.common.text.converters import to_bytes diff --git a/ansible_collections/cloud/common/tests/unit/plugins/module_utils/turbo/test_module.py b/ansible_collections/cloud/common/tests/unit/plugins/module_utils/turbo/test_module.py index 61a02e145..ecfb1d60f 100644 --- a/ansible_collections/cloud/common/tests/unit/plugins/module_utils/turbo/test_module.py +++ b/ansible_collections/cloud/common/tests/unit/plugins/module_utils/turbo/test_module.py @@ -6,7 +6,6 @@ import sys import pytest - from ansible_collections.cloud.common.plugins.module_utils.turbo.module import ( AnsibleTurboModule, ) diff --git a/ansible_collections/cloud/common/tests/unit/plugins/module_utils/turbo/test_turbo_module.py b/ansible_collections/cloud/common/tests/unit/plugins/module_utils/turbo/test_turbo_module.py index 6401046a0..1d24d9b60 100644 --- a/ansible_collections/cloud/common/tests/unit/plugins/module_utils/turbo/test_turbo_module.py +++ b/ansible_collections/cloud/common/tests/unit/plugins/module_utils/turbo/test_turbo_module.py @@ -3,22 +3,24 @@ # GNU General Public License v3.0+ # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# py38 only, See: https://github.com/PyCQA/pylint/issues/2976 -from unittest.mock import Mock, ANY # pylint: disable=syntax-error -import time -import pytest +import os import socket import subprocess -import os -import ansible.module_utils.basic -from pathlib import Path import sys +import time +from pathlib import Path + +# py38 only, See: https://github.com/PyCQA/pylint/issues/2976 +from unittest.mock import ANY, Mock # pylint: disable=syntax-error + +import ansible.module_utils.basic +import ansible_collections.cloud.common.plugins.module_utils.turbo.common as turbo_common +import pytest from ansible_collections.cloud.common.plugins.module_utils.turbo.module import ( - get_collection_name_from_path, expand_argument_specs_aliases, + get_collection_name_from_path, prepare_args, ) -import ansible_collections.cloud.common.plugins.module_utils.turbo.common as turbo_common @pytest.mark.parametrize( |