diff --git a/Makefile b/Makefile index 969163221b..25de623ff8 100644 --- a/Makefile +++ b/Makefile @@ -403,7 +403,7 @@ test_collection_sanity: mkdir -p sanity/ansible_collections/awx cp -Ra awx_collection sanity/ansible_collections/awx/awx # symlinks do not work cd sanity/ansible_collections/awx/awx && git init && git add . # requires both this file structure and a git repo, so there you go - cd sanity/ansible_collections/awx/awx && ansible-test sanity --test validate-modules + cd sanity/ansible_collections/awx/awx && ansible-test sanity build_collection: ansible-playbook -i localhost, awx_collection/template_galaxy.yml -e collection_package=$(COLLECTION_PACKAGE) -e collection_namespace=$(COLLECTION_NAMESPACE) -e collection_version=$(VERSION) diff --git a/awx_collection/plugins/doc_fragments/auth.py b/awx_collection/plugins/doc_fragments/auth.py index 5583710201..4187a17b2a 100644 --- a/awx_collection/plugins/doc_fragments/auth.py +++ b/awx_collection/plugins/doc_fragments/auth.py @@ -3,6 +3,9 @@ # Copyright: (c) 2017, Wayne Witzel III # 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 + class ModuleDocFragment(object): diff --git a/awx_collection/plugins/module_utils/ansible_tower.py b/awx_collection/plugins/module_utils/ansible_tower.py index c71f096455..97dff798a9 100644 --- a/awx_collection/plugins/module_utils/ansible_tower.py +++ b/awx_collection/plugins/module_utils/ansible_tower.py @@ -26,6 +26,9 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + import os import traceback diff --git a/awx_collection/plugins/modules/tower_job_wait.py b/awx_collection/plugins/modules/tower_job_wait.py index 0f03cda474..87b1f9f27c 100644 --- a/awx_collection/plugins/modules/tower_job_wait.py +++ b/awx_collection/plugins/modules/tower_job_wait.py @@ -142,7 +142,7 @@ def main(): except exc.NotFound as excinfo: fail_json = dict(msg='Unable to wait, no job_id {0} found: {1}'.format(job_id, excinfo), changed=False) except exc.JobFailure as excinfo: - fail_json = dict(msg='Job with id={} failed, error: {}'.format(job_id, excinfo)) + fail_json = dict(msg='Job with id={0} failed, error: {1}'.format(job_id, excinfo)) fail_json['success'] = False result = job.get(job_id) for k in ('id', 'status', 'elapsed', 'started', 'finished'): diff --git a/awx_collection/test/awx/conftest.py b/awx_collection/test/awx/conftest.py index 3cf7295246..ee99f03406 100644 --- a/awx_collection/test/awx/conftest.py +++ b/awx_collection/test/awx/conftest.py @@ -1,3 +1,6 @@ +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + import io import json import datetime @@ -60,10 +63,10 @@ def run_module(): # Note that a proper Ansiballz explosion of the modules will have an import path like: # ansible_collections.awx.awx.plugins.modules.{} # We should consider supporting that in the future - resource_module = importlib.import_module('plugins.modules.{}'.format(module_name)) + resource_module = importlib.import_module('plugins.modules.{0}'.format(module_name)) if not isinstance(module_params, dict): - raise RuntimeError('Module params must be dict, got {}'.format(type(module_params))) + raise RuntimeError('Module params must be dict, got {0}'.format(type(module_params))) # Ansible params can be passed as an invocation argument or over stdin # this short circuits within the AnsibleModule interface diff --git a/awx_collection/test/awx/test_credential.py b/awx_collection/test/awx/test_credential.py index 5225573baf..9d246a1db8 100644 --- a/awx_collection/test/awx/test_credential.py +++ b/awx_collection/test/awx/test_credential.py @@ -1,3 +1,6 @@ +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + import pytest from awx.main.models import Credential, CredentialType, Organization diff --git a/awx_collection/test/awx/test_job.py b/awx_collection/test/awx/test_job.py index a8e3369738..2fb616c2ac 100644 --- a/awx_collection/test/awx/test_job.py +++ b/awx_collection/test/awx/test_job.py @@ -1,3 +1,6 @@ +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + import pytest from django.utils.timezone import now diff --git a/awx_collection/test/awx/test_job_template.py b/awx_collection/test/awx/test_job_template.py index 47f305db18..daa9eacac5 100644 --- a/awx_collection/test/awx/test_job_template.py +++ b/awx_collection/test/awx/test_job_template.py @@ -1,3 +1,6 @@ +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + import pytest from awx.main.models import JobTemplate, Job diff --git a/awx_collection/test/awx/test_organization.py b/awx_collection/test/awx/test_organization.py index ea76940fd4..ab5f453ae8 100644 --- a/awx_collection/test/awx/test_organization.py +++ b/awx_collection/test/awx/test_organization.py @@ -1,3 +1,6 @@ +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + import pytest from awx.main.models import Organization diff --git a/awx_collection/test/awx/test_project.py b/awx_collection/test/awx/test_project.py index ad8adb867f..fa749cd6e0 100644 --- a/awx_collection/test/awx/test_project.py +++ b/awx_collection/test/awx/test_project.py @@ -1,3 +1,6 @@ +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + import pytest from awx.main.models import Project diff --git a/awx_collection/test/awx/test_send_receive.py b/awx_collection/test/awx/test_send_receive.py index 67ced22833..f0244f61cc 100644 --- a/awx_collection/test/awx/test_send_receive.py +++ b/awx_collection/test/awx/test_send_receive.py @@ -1,3 +1,6 @@ +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + import pytest import json diff --git a/awx_collection/tests/sanity/ignore-2.10.txt b/awx_collection/tests/sanity/ignore-2.10.txt new file mode 100644 index 0000000000..fa05535904 --- /dev/null +++ b/awx_collection/tests/sanity/ignore-2.10.txt @@ -0,0 +1,2 @@ +plugins/modules/tower_group.py use-argspec-type-path +plugins/modules/tower_host.py use-argspec-type-path \ No newline at end of file diff --git a/awx_collection/tests/sanity/ignore-2.9.txt b/awx_collection/tests/sanity/ignore-2.9.txt index 4d3942ddf0..fa05535904 100644 --- a/awx_collection/tests/sanity/ignore-2.9.txt +++ b/awx_collection/tests/sanity/ignore-2.9.txt @@ -1,44 +1,2 @@ -plugins/modules/tower_credential_type.py validate-modules:missing-module-utils-import -plugins/modules/tower_group.py validate-modules:missing-module-utils-import -plugins/modules/tower_host.py validate-modules:missing-module-utils-import -plugins/modules/tower_inventory.py validate-modules:missing-module-utils-import -plugins/modules/tower_inventory_source.py validate-modules:missing-module-utils-import -plugins/modules/tower_job_cancel.py validate-modules:missing-module-utils-import -plugins/modules/tower_job_launch.py validate-modules:missing-module-utils-import -plugins/modules/tower_job_list.py validate-modules:missing-module-utils-import -plugins/modules/tower_job_template.py validate-modules:missing-module-utils-import -plugins/modules/tower_label.py validate-modules:missing-module-utils-import -plugins/modules/tower_notification.py validate-modules:missing-module-utils-import -plugins/modules/tower_organization.py validate-modules:missing-module-utils-import -plugins/modules/tower_project.py validate-modules:missing-module-utils-import -plugins/modules/tower_receive.py validate-modules:missing-module-utils-import -plugins/modules/tower_role.py validate-modules:missing-module-utils-import -plugins/modules/tower_settings.py validate-modules:missing-module-utils-import -plugins/modules/tower_team.py validate-modules:missing-module-utils-import -plugins/modules/tower_user.py validate-modules:missing-module-utils-import -plugins/modules/tower_workflow_launch.py validate-modules:missing-module-utils-import -plugins/modules/tower_workflow_template.py validate-modules:missing-module-utils-import -plugins/modules/tower_credential_type.py validate-modules:import-error -plugins/modules/tower_credential.py validate-modules:import-error -plugins/modules/tower_group.py validate-modules:import-error -plugins/modules/tower_host.py validate-modules:import-error -plugins/modules/tower_inventory.py validate-modules:import-error -plugins/modules/tower_inventory_source.py validate-modules:import-error -plugins/modules/tower_job_cancel.py validate-modules:import-error -plugins/modules/tower_job_launch.py validate-modules:import-error -plugins/modules/tower_job_list.py validate-modules:import-error -plugins/modules/tower_job_wait.py validate-modules:import-error -plugins/modules/tower_job_template.py validate-modules:import-error -plugins/modules/tower_label.py validate-modules:import-error -plugins/modules/tower_notification.py validate-modules:import-error -plugins/modules/tower_organization.py validate-modules:import-error -plugins/modules/tower_project.py validate-modules:import-error -plugins/modules/tower_receive.py validate-modules:import-error -plugins/modules/tower_role.py validate-modules:import-error -plugins/modules/tower_settings.py validate-modules:import-error -plugins/modules/tower_send.py validate-modules:import-error -plugins/modules/tower_team.py validate-modules:import-error -plugins/modules/tower_user.py validate-modules:import-error -plugins/modules/tower_workflow_launch.py validate-modules:import-error -plugins/modules/tower_workflow_template.py validate-modules:import-error -plugins/modules/tower_workflow_job_template.py validate-modules:import-error \ No newline at end of file +plugins/modules/tower_group.py use-argspec-type-path +plugins/modules/tower_host.py use-argspec-type-path \ No newline at end of file