From 79f4d869adf88ebc043021671549bf53563e6e73 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Wed, 1 Jul 2020 14:16:52 +0200 Subject: [PATCH] Fix sanity test errors. (#79) --- plugins/modules/acme_certificate.py | 1 + tests/sanity/ignore-2.10.txt | 11 ----------- tests/sanity/ignore-2.11.txt | 11 ----------- tests/sanity/ignore-2.9.txt | 10 ---------- tests/unit/mock/path.py | 3 +++ tests/unit/mock/yaml_helper.py | 3 +++ tests/unit/plugins/module_utils/conftest.py | 3 +++ tests/unit/plugins/modules/conftest.py | 3 +++ tests/unit/plugins/modules/utils.py | 3 +++ 9 files changed, 16 insertions(+), 32 deletions(-) diff --git a/plugins/modules/acme_certificate.py b/plugins/modules/acme_certificate.py index b9f77f99..107a1450 100644 --- a/plugins/modules/acme_certificate.py +++ b/plugins/modules/acme_certificate.py @@ -212,6 +212,7 @@ options: to the same certificate in the chain." - "This option can only be used with the C(cryptography) backend." type: list + elements: dict version_added: '1.0.0' suboptions: test_certificates: diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt index c9f2cb39..43335011 100644 --- a/tests/sanity/ignore-2.10.txt +++ b/tests/sanity/ignore-2.10.txt @@ -4,16 +4,5 @@ plugins/module_utils/compat/ipaddress.py no-assert plugins/module_utils/compat/ipaddress.py no-unicode-literals plugins/module_utils/crypto/__init__.py empty-init plugins/modules/acme_account_info.py validate-modules:return-syntax-error -plugins/modules/acme_certificate.py validate-modules:doc-elements-mismatch -tests/unit/mock/path.py future-import-boilerplate -tests/unit/mock/path.py metaclass-boilerplate -tests/unit/mock/yaml_helper.py future-import-boilerplate -tests/unit/mock/yaml_helper.py metaclass-boilerplate -tests/unit/plugins/module_utils/conftest.py future-import-boilerplate -tests/unit/plugins/module_utils/conftest.py metaclass-boilerplate -tests/unit/plugins/modules/conftest.py future-import-boilerplate -tests/unit/plugins/modules/conftest.py metaclass-boilerplate -tests/unit/plugins/modules/utils.py future-import-boilerplate -tests/unit/plugins/modules/utils.py metaclass-boilerplate tests/utils/shippable/check_matrix.py replace-urlopen tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.11.txt b/tests/sanity/ignore-2.11.txt index c9f2cb39..43335011 100644 --- a/tests/sanity/ignore-2.11.txt +++ b/tests/sanity/ignore-2.11.txt @@ -4,16 +4,5 @@ plugins/module_utils/compat/ipaddress.py no-assert plugins/module_utils/compat/ipaddress.py no-unicode-literals plugins/module_utils/crypto/__init__.py empty-init plugins/modules/acme_account_info.py validate-modules:return-syntax-error -plugins/modules/acme_certificate.py validate-modules:doc-elements-mismatch -tests/unit/mock/path.py future-import-boilerplate -tests/unit/mock/path.py metaclass-boilerplate -tests/unit/mock/yaml_helper.py future-import-boilerplate -tests/unit/mock/yaml_helper.py metaclass-boilerplate -tests/unit/plugins/module_utils/conftest.py future-import-boilerplate -tests/unit/plugins/module_utils/conftest.py metaclass-boilerplate -tests/unit/plugins/modules/conftest.py future-import-boilerplate -tests/unit/plugins/modules/conftest.py metaclass-boilerplate -tests/unit/plugins/modules/utils.py future-import-boilerplate -tests/unit/plugins/modules/utils.py metaclass-boilerplate tests/utils/shippable/check_matrix.py replace-urlopen tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt index 6fabef25..f12ed5f7 100644 --- a/tests/sanity/ignore-2.9.txt +++ b/tests/sanity/ignore-2.9.txt @@ -3,15 +3,5 @@ plugins/module_utils/compat/ipaddress.py metaclass-boilerplate plugins/module_utils/compat/ipaddress.py no-assert plugins/module_utils/compat/ipaddress.py no-unicode-literals plugins/module_utils/crypto/__init__.py empty-init -tests/unit/mock/path.py future-import-boilerplate -tests/unit/mock/path.py metaclass-boilerplate -tests/unit/mock/yaml_helper.py future-import-boilerplate -tests/unit/mock/yaml_helper.py metaclass-boilerplate -tests/unit/plugins/module_utils/conftest.py future-import-boilerplate -tests/unit/plugins/module_utils/conftest.py metaclass-boilerplate -tests/unit/plugins/modules/conftest.py future-import-boilerplate -tests/unit/plugins/modules/conftest.py metaclass-boilerplate -tests/unit/plugins/modules/utils.py future-import-boilerplate -tests/unit/plugins/modules/utils.py metaclass-boilerplate tests/utils/shippable/check_matrix.py replace-urlopen tests/utils/shippable/timing.py shebang diff --git a/tests/unit/mock/path.py b/tests/unit/mock/path.py index b2101a13..a6c87429 100644 --- a/tests/unit/mock/path.py +++ b/tests/unit/mock/path.py @@ -1,3 +1,6 @@ +from __future__ import absolute_import, division, print_function +__metaclass__ = type + from ansible_collections.community.crypto.tests.unit.compat.mock import MagicMock from ansible.utils.path import unfrackpath diff --git a/tests/unit/mock/yaml_helper.py b/tests/unit/mock/yaml_helper.py index cc095fea..bf0aa8d8 100644 --- a/tests/unit/mock/yaml_helper.py +++ b/tests/unit/mock/yaml_helper.py @@ -1,3 +1,6 @@ +from __future__ import absolute_import, division, print_function +__metaclass__ = type + import io import yaml diff --git a/tests/unit/plugins/module_utils/conftest.py b/tests/unit/plugins/module_utils/conftest.py index 9e4e5257..89aecf85 100644 --- a/tests/unit/plugins/module_utils/conftest.py +++ b/tests/unit/plugins/module_utils/conftest.py @@ -1,6 +1,9 @@ # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) +from __future__ import absolute_import, division, print_function +__metaclass__ = type + import json import sys from io import BytesIO diff --git a/tests/unit/plugins/modules/conftest.py b/tests/unit/plugins/modules/conftest.py index 3bbfe0b7..5ecd9163 100644 --- a/tests/unit/plugins/modules/conftest.py +++ b/tests/unit/plugins/modules/conftest.py @@ -1,3 +1,6 @@ +from __future__ import absolute_import, division, print_function +__metaclass__ = type + # Copyright (c) 2017 Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/tests/unit/plugins/modules/utils.py b/tests/unit/plugins/modules/utils.py index dfa205df..d2d520d7 100644 --- a/tests/unit/plugins/modules/utils.py +++ b/tests/unit/plugins/modules/utils.py @@ -1,3 +1,6 @@ +from __future__ import absolute_import, division, print_function +__metaclass__ = type + import json from ansible_collections.community.crypto.tests.unit.compat import unittest