Merge "Remove unnecessary check for pytest.skip"

[vvp/validation-scripts.git] / 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 86270fd..9225e1e 100644 (file)
--- a/ice_validator/tests/test_env_and_yaml_same_name.py
+++ b/ice_validator/tests/test_env_and_yaml_same_name.py
@@ -1,12 +1,12 @@
 # -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
+# ============LICENSE_START====================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
 # Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -35,27 +35,30 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 from .helpers import validates
 
+"""test_env_and_yaml_same_name
+"""
 from os import listdir
 from os import path
 
+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]
-        assert basename + '.yaml' in yaml_files or \
-            basename + '.yml' 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