From 553b49245f6e78743717258b1fbaa29c15c942c9 Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Mon, 13 Mar 2023 17:13:26 +0900 Subject: [PATCH] Support new test-sanity-docker-devel test * Remove unused module import Signed-off-by: Hideki Saito --- changelogs/fragments/425-support_test-sanity-docker-devel.yml | 2 ++ plugins/module_utils/version.py | 2 ++ plugins/modules/firewalld_info.py | 1 - tests/unit/compat/builtins.py | 1 + tests/unit/plugins/action/test_synchronize.py | 1 - 5 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/425-support_test-sanity-docker-devel.yml diff --git a/changelogs/fragments/425-support_test-sanity-docker-devel.yml b/changelogs/fragments/425-support_test-sanity-docker-devel.yml new file mode 100644 index 0000000..e66622c --- /dev/null +++ b/changelogs/fragments/425-support_test-sanity-docker-devel.yml @@ -0,0 +1,2 @@ +trivial: + - ansible.posix - removed unused module import from the code. diff --git a/plugins/module_utils/version.py b/plugins/module_utils/version.py index 26d8c30..c6a5f68 100644 --- a/plugins/module_utils/version.py +++ b/plugins/module_utils/version.py @@ -16,3 +16,5 @@ __metaclass__ = type # from ansible.module_utils.compat.version import LooseVersion from ._version import LooseVersion, StrictVersion + +__all__ = ['LooseVersion', 'StrictVersion'] diff --git a/plugins/modules/firewalld_info.py b/plugins/modules/firewalld_info.py index 29257bc..024dd39 100644 --- a/plugins/modules/firewalld_info.py +++ b/plugins/modules/firewalld_info.py @@ -204,7 +204,6 @@ firewalld_info: ''' from ansible.module_utils.basic import AnsibleModule, missing_required_lib -from ansible.module_utils.six import raise_from from ansible.module_utils._text import to_native from ansible_collections.ansible.posix.plugins.module_utils.version import StrictVersion diff --git a/tests/unit/compat/builtins.py b/tests/unit/compat/builtins.py index f60ee67..f8e6c3d 100644 --- a/tests/unit/compat/builtins.py +++ b/tests/unit/compat/builtins.py @@ -31,3 +31,4 @@ except ImportError: BUILTINS = 'builtins' else: BUILTINS = '__builtin__' + __all__ = ['__builtin__'] diff --git a/tests/unit/plugins/action/test_synchronize.py b/tests/unit/plugins/action/test_synchronize.py index 40e489d..1c4a241 100644 --- a/tests/unit/plugins/action/test_synchronize.py +++ b/tests/unit/plugins/action/test_synchronize.py @@ -19,7 +19,6 @@ import os import unittest import yaml -import ansible.plugins from ansible_collections.ansible.posix.tests.unit.compat.mock import patch, MagicMock from ansible_collections.ansible.posix.plugins.action.synchronize import ActionModule