From 60d5ad7d00eadd6395eca186e6fa76a43df3c6cf Mon Sep 17 00:00:00 2001 From: "stark, steven" Date: Fri, 14 Sep 2018 07:55:49 -0700 Subject: [VVP] udpating scripts for casablanca 2 adding scripts updates adding docrators for sections 5.2.6 - end closes out VVP 80 Change-Id: Iecac476949aa3ae3982f8c77671869583eb313d6 Issue-ID: VVP-80 Signed-off-by: stark, steven --- .../tests/test_environment_file_structure.py | 58 +++------------------- 1 file changed, 6 insertions(+), 52 deletions(-) (limited to 'ice_validator/tests/test_environment_file_structure.py') diff --git a/ice_validator/tests/test_environment_file_structure.py b/ice_validator/tests/test_environment_file_structure.py index 34d3b48..42786e9 100644 --- a/ice_validator/tests/test_environment_file_structure.py +++ b/ice_validator/tests/test_environment_file_structure.py @@ -41,69 +41,23 @@ """ environment file structure """ -import yaml -import pytest +from tests import cached_yaml as yaml from .helpers import validates -VERSION = "1.0.0" +VERSION = '1.0.0' # pylint: disable=invalid-name -def test_environment_structure(env_file): - """ - Check that all environments files only have the allowed sections - """ - key_values = [ - "parameters", - "event_sinks", - "encrypted_parameters", - "parameter_merge_strategies", - ] - - with open(env_file) as fh: - yml = yaml.load(fh) - assert [k for k in key_values if k in yml], "%s missing any of %s" % ( - env_file, - key_values, - ) - - -@validates("R-03324") +@validates('R-03324') def test_environment_file_contains_required_sections(env_file): - """ + ''' Check that all environments files only have the allowed sections - """ + ''' required_keys = ["parameters"] with open(env_file) as fh: yml = yaml.load(fh) missing_keys = [v for v in required_keys if v not in yml] - assert not missing_keys, "%s missing %s" % (env_file, missing_keys) - - -def test_environment_file_sections_have_the_right_format(env_file): - """ - Check that all environment files have sections of the right format. - Do note that it only tests for dicts or not dicts currently. - """ - dict_keys = ["parameters", "encrypted_parameters", "parameter_merge_strategies"] - not_dict_keys = ["event_sinks"] - - with open(env_file) as fh: - yml = yaml.load(fh) - - if not [k for k in dict_keys + not_dict_keys if k in yml]: - pytest.skip("The fixture is not applicable for this test") - - bad_dict_keys = [k for k in dict_keys if k in yml and not isinstance(yml[k], dict)] - bad_not_dict_keys = [ - k for k in not_dict_keys if k in yml and isinstance(yml[k], dict) - ] - errors = [] - if bad_dict_keys: - errors.append("must be dict %s" % bad_dict_keys) - if bad_not_dict_keys: - errors.append("must not be dict %s" % bad_not_dict_keys) - assert not errors, "%s errors:\n %s" % (env_file, "\n ".join(errors)) + assert not missing_keys, '%s missing %s' % (env_file, missing_keys) -- cgit 1.2.3-korg