From 1068d8a696a405e995dfa6d07e00ff1d8cc78aad Mon Sep 17 00:00:00 2001 From: Mike Graves Date: Thu, 24 Oct 2024 09:03:03 -0400 Subject: [PATCH] Update collection tests for auth changes The changes in https://github.com/ansible/awx/pull/15554 will cause a few collection tests to fail, depending on what the test configuration is. This changes the tests to look for a specific warning rather than counting the number of warnings emitted. --- awx_collection/test/awx/test_job_template.py | 2 +- awx_collection/test/awx/test_project.py | 2 +- awx_collection/test/awx/test_user.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/awx_collection/test/awx/test_job_template.py b/awx_collection/test/awx/test_job_template.py index 5ee114359bbd..16ac36f82f0e 100644 --- a/awx_collection/test/awx/test_job_template.py +++ b/awx_collection/test/awx/test_job_template.py @@ -240,7 +240,7 @@ 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( + silence_warning.assert_any_call( "The field survey_spec of job_template {0} has encrypted data and " "may inaccurately report task is changed.".format(result['id']) ) diff --git a/awx_collection/test/awx/test_project.py b/awx_collection/test/awx/test_project.py index 04ec05bbf75a..27b7b96e05d6 100644 --- a/awx_collection/test/awx/test_project.py +++ b/awx_collection/test/awx/test_project.py @@ -14,7 +14,7 @@ def test_create_project(run_module, admin_user, organization, silence_warning): dict(name='foo', organization=organization.name, scm_type='git', scm_url='https://foo.invalid', wait=False, scm_update_cache_timeout=5), admin_user, ) - silence_warning.assert_called_once_with('scm_update_cache_timeout will be ignored since scm_update_on_launch was not set to true') + silence_warning.assert_any_call('scm_update_cache_timeout will be ignored since scm_update_on_launch was not set to true') assert result.pop('changed', None), result diff --git a/awx_collection/test/awx/test_user.py b/awx_collection/test/awx/test_user.py index 1513b05a9173..a183c7a5551c 100644 --- a/awx_collection/test/awx/test_user.py +++ b/awx_collection/test/awx/test_user.py @@ -36,7 +36,7 @@ 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( + silence_warning.assert_any_call( "The field password of user {0} has encrypted data and " "may inaccurately report task is changed.".format(result['id']) )