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 --- ice_validator/tests/test_env_and_yaml_same_name.py | 25 +++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'ice_validator/tests/test_env_and_yaml_same_name.py') diff --git a/ice_validator/tests/test_env_and_yaml_same_name.py b/ice_validator/tests/test_env_and_yaml_same_name.py index 58b0f39..46a0917 100644 --- a/ice_validator/tests/test_env_and_yaml_same_name.py +++ b/ice_validator/tests/test_env_and_yaml_same_name.py @@ -39,27 +39,32 @@ # from .helpers import validates -"""test_env_and_yaml_same_name -""" +'''test_env_and_yaml_same_name +''' from os import listdir from os import path -VERSION = "1.0.0" +VERSION = '1.0.0' -@validates("R-67205", "R-35727", "R-22656") +@validates('R-38474', 'R-81725', 'R-53433') def test_env_and_yaml_same_name(template_dir): - """ + ''' Check that all environment template filenames are identical to an associated Heat template filenames. Log the result of the check and add the filename of any environment file that is badly named. - """ + ''' files = listdir(template_dir) - env_files = [f for f in files if path.splitext(f)[-1] == ".env"] - yaml_files = [f for f in files if path.splitext(f)[-1] in [".yml", ".yaml"]] + env_files = [f for f in files + if path.splitext(f)[-1] == ".env"] + yaml_files = [f for f in files + if path.splitext(f)[-1] in ['.yml', '.yaml']] unmatched = [] for filename in env_files: basename = path.splitext(filename)[0] - if basename + ".yaml" not in yaml_files and basename + ".yml" not in yaml_files: + if (basename + '.yaml' not in yaml_files + and basename + '.yml' not in yaml_files): unmatched.append(filename) - assert not unmatched, "files with no corresponding .y[a]ml %s" % unmatched + assert not unmatched, ( + 'files with no corresponding .y[a]ml %s' % unmatched) + -- cgit 1.2.3-korg