diff --git a/awx_collection/plugins/module_utils/tower_api.py b/awx_collection/plugins/module_utils/tower_api.py index 7d042d9419..92328ae078 100644 --- a/awx_collection/plugins/module_utils/tower_api.py +++ b/awx_collection/plugins/module_utils/tower_api.py @@ -33,7 +33,7 @@ class ItemNotDefined(Exception): class TowerModule(AnsibleModule): # This gets set by the make process so whatever is in here is irrelevant - _COLLECTION_VERSION = "11.1.0" + _COLLECTION_VERSION = "11.0.0" _COLLECTION_TYPE = "awx" # This maps the collections type (awx/tower) to the values returned by the API # Those values can be found in awx/api/generics.py line 204 @@ -339,7 +339,7 @@ class TowerModule(AnsibleModule): data = dumps(kwargs.get('data', {})) with open('/tmp/john', 'w') as f: - f.write("{}".format(self.url.geturl())) + f.write("{0}".format(self.url.geturl())) try: response = self.session.open(method, self.url.geturl(), headers=headers, validate_certs=self.verify_ssl, follow_redirects=True, data=data) diff --git a/awx_collection/test/awx/test_job_template.py b/awx_collection/test/awx/test_job_template.py index 497d93dfcc..2f468edd55 100644 --- a/awx_collection/test/awx/test_job_template.py +++ b/awx_collection/test/awx/test_job_template.py @@ -4,6 +4,7 @@ __metaclass__ = type import pytest from awx.main.models import ActivityStream, JobTemplate, Job, NotificationTemplate +from unittest import mock @pytest.mark.django_db @@ -161,10 +162,9 @@ def test_job_template_with_survey_encrypted_default(run_module, admin_user, proj assert result.get('changed', False), result # not actually desired, but assert for sanity - silence_warning.assert_called_once_with( - "The field survey_spec of job_template {0} has encrypted data and " - "may inaccurately report task is changed.".format(result['id']) - ) + silence_warning.assert_has_calls( + [mock.call("The field survey_spec of job_template {0} has encrypted data and " + "may inaccurately report task is changed.".format(result['id']))]) @pytest.mark.django_db diff --git a/awx_collection/test/awx/test_project.py b/awx_collection/test/awx/test_project.py index babe2edf54..8bce0d18c5 100644 --- a/awx_collection/test/awx/test_project.py +++ b/awx_collection/test/awx/test_project.py @@ -19,7 +19,10 @@ def test_create_project(run_module, admin_user, organization): wait=False, scm_update_cache_timeout=5 ), admin_user) - mock_warn.assert_called_once_with('scm_update_cache_timeout will be ignored since scm_update_on_launch was not set to true') + mock_warn.assert_has_calls( + [mock.call('scm_update_cache_timeout will be ignored since scm_update_on_launch ' + 'was not set to true')]) + assert result.pop('changed', None), result proj = Project.objects.get(name='foo') diff --git a/awx_collection/test/awx/test_user.py b/awx_collection/test/awx/test_user.py index bb0821ccd2..51c47b6755 100644 --- a/awx_collection/test/awx/test_user.py +++ b/awx_collection/test/awx/test_user.py @@ -41,7 +41,6 @@ def test_password_no_op_warning(run_module, admin_user, mock_auth_stuff, silence assert result.get('changed') # not actually desired, but assert for sanity - silence_warning.assert_called_once_with( - "The field password of user {0} has encrypted data and " - "may inaccurately report task is changed.".format(result['id']) - ) + silence_warning.assert_has_calls( + [mock.call("The field password of user {0} has encrypted data and " + "may inaccurately report task is changed.".format(result['id']))])