mirror of
https://github.com/ansible/awx.git
synced 2026-03-16 08:27:29 -02:30
Merge branch 'fix-awx_collection-docs' of github.com:sean-m-sullivan/awx into fix-awx_collection-docs
This commit is contained in:
@@ -37,7 +37,7 @@ ignore_parameters = [
|
||||
# Add the module name as the key with the value being the list of params to ignore
|
||||
no_api_parameter_ok = {
|
||||
# The wait is for whether or not to wait for a project update on change
|
||||
'tower_project': ['wait'],
|
||||
'tower_project': ['wait', 'interval', 'update_project'],
|
||||
# Existing_token and id are for working with an existing tokens
|
||||
'tower_token': ['existing_token', 'existing_token_id'],
|
||||
# /survey spec is now how we handle associations
|
||||
|
||||
@@ -81,10 +81,11 @@ def test_resets_job_template_values(run_module, admin_user, project, inventory):
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_job_launch_with_prompting(run_module, admin_user, project, inventory, machine_credential):
|
||||
def test_job_launch_with_prompting(run_module, admin_user, project, organization, inventory, machine_credential):
|
||||
JobTemplate.objects.create(
|
||||
name='foo',
|
||||
project=project,
|
||||
organization=organization,
|
||||
playbook='helloworld.yml',
|
||||
ask_variables_on_launch=True,
|
||||
ask_inventory_on_launch=True,
|
||||
|
||||
@@ -136,5 +136,5 @@ def test_build_notification_message_undefined(run_module, admin_user, organizati
|
||||
), admin_user)
|
||||
nt = NotificationTemplate.objects.get(id=result['id'])
|
||||
|
||||
_, body = job.build_notification_message(nt, 'running')
|
||||
assert '{"started_by": "My Placeholder"}' in body
|
||||
body = job.build_notification_message(nt, 'running')
|
||||
assert '{"started_by": "My Placeholder"}' in body[1]
|
||||
|
||||
Reference in New Issue
Block a user