External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3697 from AlanCoding/conservative_upgrades

Browse Source 
Apply critical dependency upgrades

Reviewed-by: Alan Rominger <arominge@redhat.com>
             https://github.com/AlanCoding
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-04-15 13:24:25 +00:00
committed by GitHub
parent e8de7bc845 569cd3b34e
commit 890de400e2
10 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
awx/main/tests/unit/test_tasks.py
View File

@@ -172,7 +172,7 @@ def test_openstack_client_config_generation(mocker, source, expected, private_da
'ansible_virtualenv_path': '/venv/foo'
})
cloud_config = update.build_private_data(inventory_update, private_data_dir)
cloud_credential = yaml.load(
cloud_credential = yaml.safe_load(
cloud_config.get('credentials')[credential]
)
assert cloud_credential['clouds'] == {
@@ -215,7 +215,7 @@ def test_openstack_client_config_generation_with_private_source_vars(mocker, sou
})
cloud_config = update.build_private_data(inventory_update, private_data_dir)
cloud_credential = yaml.load(
cloud_config.get('credentials')[credential]
cloud_config.get('credentials')[credential], Loader=SafeLoader
)
assert cloud_credential['clouds'] == {
'devstack': {
@@ -249,7 +249,7 @@ def parse_extra_vars(args):
for chunk in args:
if chunk.startswith('@/tmp/'):
with open(chunk.strip('@'), 'r') as f:
extra_vars.update(yaml.load(f, SafeLoader))
extra_vars.update(yaml.load(f, Loader=SafeLoader))
return extra_vars
@@ -268,7 +268,7 @@ class TestExtraVarSanitation(TestJobExecution):
task.build_extra_vars_file(job, private_data_dir, {})
fd = open(os.path.join(private_data_dir, 'env', 'extravars'))
extra_vars = yaml.load(fd, SafeLoader)
extra_vars = yaml.load(fd, Loader=SafeLoader)
# ensure that strings are marked as unsafe
for unsafe in ['awx_job_template_name', 'tower_job_template_name',
@@ -292,7 +292,7 @@ class TestExtraVarSanitation(TestJobExecution):
task.build_extra_vars_file(job, private_data_dir, {})
fd = open(os.path.join(private_data_dir, 'env', 'extravars'))
extra_vars = yaml.load(fd, SafeLoader)
extra_vars = yaml.load(fd, Loader=SafeLoader)
assert extra_vars['msg'] == self.UNSAFE
assert hasattr(extra_vars['msg'], '__UNSAFE__')
@@ -303,7 +303,7 @@ class TestExtraVarSanitation(TestJobExecution):
task.build_extra_vars_file(job, private_data_dir, {})
fd = open(os.path.join(private_data_dir, 'env', 'extravars'))
extra_vars = yaml.load(fd, SafeLoader)
extra_vars = yaml.load(fd, Loader=SafeLoader)
assert extra_vars['msg'] == {'a': [self.UNSAFE]}
assert hasattr(extra_vars['msg']['a'][0], '__UNSAFE__')
@@ -314,7 +314,7 @@ class TestExtraVarSanitation(TestJobExecution):
task.build_extra_vars_file(job, private_data_dir, {})
fd = open(os.path.join(private_data_dir, 'env', 'extravars'))
extra_vars = yaml.load(fd, SafeLoader)
extra_vars = yaml.load(fd, Loader=SafeLoader)
assert extra_vars['msg'] == self.UNSAFE
assert not hasattr(extra_vars['msg'], '__UNSAFE__')
@@ -326,7 +326,7 @@ class TestExtraVarSanitation(TestJobExecution):
task.build_extra_vars_file(job, private_data_dir, {})
fd = open(os.path.join(private_data_dir, 'env', 'extravars'))
extra_vars = yaml.load(fd, SafeLoader)
extra_vars = yaml.load(fd, Loader=SafeLoader)
assert extra_vars['msg'] == {'a': {'b': [self.UNSAFE]}}
assert not hasattr(extra_vars['msg']['a']['b'][0], '__UNSAFE__')
@@ -343,7 +343,7 @@ class TestExtraVarSanitation(TestJobExecution):
task.build_extra_vars_file(job, private_data_dir, {})
fd = open(os.path.join(private_data_dir, 'env', 'extravars'))
extra_vars = yaml.load(fd, SafeLoader)
extra_vars = yaml.load(fd, Loader=SafeLoader)
assert extra_vars['msg'] == 'other-value'
assert hasattr(extra_vars['msg'], '__UNSAFE__')
@@ -358,7 +358,7 @@ class TestExtraVarSanitation(TestJobExecution):
task.build_extra_vars_file(job, private_data_dir, {})
fd = open(os.path.join(private_data_dir, 'env', 'extravars'))
extra_vars = yaml.load(fd, SafeLoader)
extra_vars = yaml.load(fd, Loader=SafeLoader)
assert extra_vars['msg'] == self.UNSAFE
assert hasattr(extra_vars['msg'], '__UNSAFE__')

2
awx/main/tests/unit/utils/test_common.py
View File

@@ -59,7 +59,7 @@ class TestParserExceptions:
@staticmethod
def yaml_error(data):
try:
yaml.load(data)
yaml.safe_load(data)
return None
except Exception as e:
return str(e)