diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index a0453b0..eb582c6 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Perform sanity testing with ansible-test uses: ansible-community/ansible-test-gh-action@release/v1 @@ -70,7 +70,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Perform unit testing with ansible-test uses: ansible-community/ansible-test-gh-action@release/v1 @@ -115,7 +115,7 @@ jobs: # steps: # - name: Check out code - # uses: actions/checkout@v2 + # uses: actions/checkout@v3 # - name: Perform integration testing with ansible-test # uses: ansible-community/ansible-test-gh-action@release/v1 diff --git a/changelogs/fragments/29-fix-lint-issues.yml b/changelogs/fragments/29-fix-lint-issues.yml new file mode 100644 index 0000000..3aa549d --- /dev/null +++ b/changelogs/fragments/29-fix-lint-issues.yml @@ -0,0 +1,6 @@ +bugfixes: + - fixes failures in sanity test for plugins/modules/sap_pyrfc.py + - fixes failures in sanity test for tests/unit/compat/builtins.py + - fixes failures in sanity test for tests/unit/plugins/modules/test_sap_system_facts.py + - fixes failures in sanity test for tests/unit/plugins/modules/test_sap_system_facts.py + - fixes pipeline warnings diff --git a/plugins/modules/sap_pyrfc.py b/plugins/modules/sap_pyrfc.py index 78156e8..fa66b6a 100644 --- a/plugins/modules/sap_pyrfc.py +++ b/plugins/modules/sap_pyrfc.py @@ -113,7 +113,7 @@ from ..module_utils.pyrfc_handler import get_connection try: - from pyrfc import ABAPApplicationError, ABAPRuntimeError, CommunicationError, Connection, LogonError + from pyrfc import ABAPApplicationError, ABAPRuntimeError, CommunicationError, LogonError except ImportError: HAS_PYRFC_LIBRARY = False PYRFC_LIBRARY_IMPORT_ERROR = traceback.format_exc() diff --git a/tests/unit/compat/builtins.py b/tests/unit/compat/builtins.py index f60ee67..ced77f8 100644 --- a/tests/unit/compat/builtins.py +++ b/tests/unit/compat/builtins.py @@ -22,12 +22,3 @@ # # Compat for python2.7 # - -# One unittest needs to import builtins via __import__() so we need to have -# the string that represents it -try: - import __builtin__ -except ImportError: - BUILTINS = 'builtins' -else: - BUILTINS = '__builtin__' diff --git a/tests/unit/plugins/modules/test_sap_system_facts.py b/tests/unit/plugins/modules/test_sap_system_facts.py index 85a57aa..4c88234 100644 --- a/tests/unit/plugins/modules/test_sap_system_facts.py +++ b/tests/unit/plugins/modules/test_sap_system_facts.py @@ -5,12 +5,11 @@ from __future__ import absolute_import, division, print_function -import mock __metaclass__ = type from ansible_collections.community.sap_libs.plugins.modules import sap_system_facts from ansible_collections.community.sap_libs.tests.unit.plugins.modules.utils import AnsibleExitJson, ModuleTestCase -from ansible_collections.community.sap_libs.tests.unit.compat.mock import patch, MagicMock +from ansible_collections.community.sap_libs.tests.unit.compat.mock import patch from ansible.module_utils import basic