Merge pull request #56327 from mchugh19/56324

keep cache_copied_files variable a list
saltstack · Mar 13, 2020 · d8fc072 · d8fc072
2 parents 2d31d61 + e1e2df2
commit d8fc072
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/salt/modules/saltcheck.py b/salt/modules/saltcheck.py
@@ -1133,8 +1133,8 @@ def add_test_files_for_sls(self, sls_name, check_all=False):
                                     '{0}.tst'.format(split_sls[-1]))
                     ])
                     # for this state, find matching test files and load them
-                    cached_copied_files = set(cached_copied_files)
-                    for this_cached_test_file in list(cached_copied_files):
+                    cached_copied_files = list(set(cached_copied_files))
+                    for this_cached_test_file in cached_copied_files:
                         if this_cached_test_file.endswith(tuple(sls_path_names)):
                             self.test_files.add(this_cached_test_file)
                             cached_copied_files.remove(this_cached_test_file)

diff --git a/tests/integration/files/file/base/validate-saltcheck/directory/init.sls b/tests/integration/files/file/base/validate-saltcheck/directory/init.sls
@@ -0,0 +1,3 @@
+directory-level1-init-test-pass:
+  test.succeed_without_changes:
+    - name: testing-saltcheck
diff --git a/tests/integration/files/file/base/validate-saltcheck/directory/level1.sls b/tests/integration/files/file/base/validate-saltcheck/directory/level1.sls
@@ -0,0 +1,3 @@
+directory-level1-test-pass:
+  test.succeed_without_changes:
+    - name: testing-saltcheck
diff --git a/tests/integration/files/file/base/validate-saltcheck/init.sls b/tests/integration/files/file/base/validate-saltcheck/init.sls
@@ -1,3 +1,7 @@
+include:
+  - validate-saltcheck.directory
+  - validate-saltcheck.directory.level1
+
 saltcheck-test-pass:
   test.succeed_without_changes:
     - name: testing-saltcheck