External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-21 02:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Make AWX_PROOT_HIDE_PATHS, AWX_PROOT_SHOW_PATHS and AWX_ANSIBLE_CALLBACK_PLUGINS not required.

Browse Source
This commit is contained in:
Chris Church
2017-01-20 16:02:18 -05:00
parent d81194f791
commit 41553c879c
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/conf.py
View File

@@ -134,6 +134,7 @@ register(
register( register(
'AWX_PROOT_HIDE_PATHS', 'AWX_PROOT_HIDE_PATHS',
field_class=fields.StringListField, field_class=fields.StringListField,
required=False,
label=_('Paths to hide from isolated jobs'), label=_('Paths to hide from isolated jobs'),
help_text=_('Additional paths to hide from isolated processes.'), help_text=_('Additional paths to hide from isolated processes.'),
category=_('Jobs'), category=_('Jobs'),
@@ -143,6 +144,7 @@ register(
register( register(
'AWX_PROOT_SHOW_PATHS', 'AWX_PROOT_SHOW_PATHS',
field_class=fields.StringListField, field_class=fields.StringListField,
required=False,
label=_('Paths to expose to isolated jobs'), label=_('Paths to expose to isolated jobs'),
help_text=_('Whitelist of paths that would otherwise be hidden to expose to isolated jobs.'), help_text=_('Whitelist of paths that would otherwise be hidden to expose to isolated jobs.'),
category=_('Jobs'), category=_('Jobs'),
@@ -182,6 +184,7 @@ register(
register( register(
'AWX_ANSIBLE_CALLBACK_PLUGINS', 'AWX_ANSIBLE_CALLBACK_PLUGINS',
field_class=fields.StringListField, field_class=fields.StringListField,
required=False,
label=_('Ansible Callback Plugins'), label=_('Ansible Callback Plugins'),
help_text=_('List of paths to search for extra callback plugins to be used when running jobs.'), help_text=_('List of paths to search for extra callback plugins to be used when running jobs.'),
category=_('Jobs'), category=_('Jobs'),

21
awx/main/tests/functional/api/test_settings.py
View File

@@ -44,6 +44,27 @@ def test_license_cannot_be_removed_via_system_settings(mock_no_license_file, get
assert response.data['LICENSE'] assert response.data['LICENSE']
@pytest.mark.django_db
def test_jobs_settings(get, put, patch, delete, admin):
url = reverse('api:setting_singleton_detail', args=('jobs',))
get(url, user=admin, expect=200)
delete(url, user=admin, expect=204)
response = get(url, user=admin, expect=200)
data = dict(response.data.items())
put(url, user=admin, data=data, expect=200)
patch(url, user=admin, data={'AWX_PROOT_HIDE_PATHS': ['/home']}, expect=200)
response = get(url, user=admin, expect=200)
assert response.data['AWX_PROOT_HIDE_PATHS'] == ['/home']
data.pop('AWX_PROOT_HIDE_PATHS')
data.pop('AWX_PROOT_SHOW_PATHS')
data.pop('AWX_ANSIBLE_CALLBACK_PLUGINS')
put(url, user=admin, data=data, expect=200)
response = get(url, user=admin, expect=200)
assert response.data['AWX_PROOT_HIDE_PATHS'] == []
assert response.data['AWX_PROOT_SHOW_PATHS'] == []
assert response.data['AWX_ANSIBLE_CALLBACK_PLUGINS'] == []
@pytest.mark.django_db @pytest.mark.django_db
def test_ldap_settings(get, put, patch, delete, admin, enterprise_license): def test_ldap_settings(get, put, patch, delete, admin, enterprise_license):
url = reverse('api:setting_singleton_detail', args=('ldap',)) url = reverse('api:setting_singleton_detail', args=('ldap',))