aboutsummaryrefslogtreecommitdiffstats
path: root/ice_validator/tests/test_files_in_flat_dir.py
diff options
context:
space:
mode:
authorLovett, Trevor <trevor.lovett@att.com>2019-06-06 20:52:03 -0500
committerLovett, Trevor <trevor.lovett@att.com>2019-06-06 20:52:03 -0500
commit8f2a256e5f8256314e54f541bee1f5dd9362f99b (patch)
treedfa50e001d6d428e6b569f2b228dcc1df5d3fc58 /ice_validator/tests/test_files_in_flat_dir.py
parent4151a1dd63510dcdc0ffadc4c49a1eff38472dc5 (diff)
[VVP] Fix redundant errors: missing base module or nested dirs
Change-Id: I50f9f3f0bd627124a679248b2cf630e818755c59 Issue-ID: VVP-218 Signed-off-by: Lovett, Trevor <trevor.lovett@att.com>
Diffstat (limited to 'ice_validator/tests/test_files_in_flat_dir.py')
-rw-r--r--ice_validator/tests/test_files_in_flat_dir.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/ice_validator/tests/test_files_in_flat_dir.py b/ice_validator/tests/test_files_in_flat_dir.py
index ac0ff7c..34732ba 100644
--- a/ice_validator/tests/test_files_in_flat_dir.py
+++ b/ice_validator/tests/test_files_in_flat_dir.py
@@ -44,7 +44,8 @@ def test_files_in_flat_dir(template_dir):
paths = (os.path.join(template_dir, p) for p in os.listdir(template_dir))
nested_dirs = (p for p in paths if os.path.isdir(p))
nested_dirs = [os.path.relpath(p, template_dir) for p in nested_dirs]
- msg = "Nested directories detected in template directory: {}".format(
- ", ".join(nested_dirs)
- )
+ msg = (
+ "Sub-directories are not allowed in a Heat package. The following "
+ "directories were detected: {}"
+ ).format(", ".join(nested_dirs))
assert not nested_dirs, msg