Skip to content

Commit

Permalink
Update collection tests for auth changes
Browse files Browse the repository at this point in the history
The changes in ansible#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.
  • Loading branch information
gravesm committed Oct 24, 2024
1 parent 55fb7c7 commit f587b36
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion awx_collection/test/awx/test_job_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
)

Expand Down
2 changes: 1 addition & 1 deletion awx_collection/test/awx/test_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion awx_collection/test/awx/test_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
)

Expand Down

0 comments on commit f587b36

Please sign in to comment.