Merge pull request idaholab#14737 from permcody/test_harness_fix

Don't snapshot unrelated test outputs

python/TestHarness/FileChecker.py

@@ -12,11 +12,11 @@
 class FileChecker(object):
     """ Class that checks files and stores last-modified times. """
 
-    def __init__(self):
+    def __init__(self, input_file_name):
         """ Establish new dictionaries for files and their corresponding modified times. """
         self.__original_times = dict()
         self.__new_times = dict()
-
+        self.__input_file_name = input_file_name
 
     def getOriginalTimes(self):
         return self.__original_times
@@ -27,6 +27,12 @@ def getNewTimes(self):
     def get_all_files(self, job, times):
         """ Method to get the names and last_modified_times of all files within current test location """
         for dirpath, dirnames, filenames in os.walk(job.getTestDir(), followlinks=True):
+
+            # When perfoming a snapshot, don't traverse into directories that have test
+            # specifications of their own
+            if os.path.exists(os.path.join(dirpath, self.__input_file_name)):
+                dirnames[:] = []
+
             for file in filenames:
                 fullyQualifiedFile = os.path.join(dirpath, file)
                 try:

python/TestHarness/schedulers/Job.py

@@ -62,7 +62,7 @@ def __init__(self, tester, job_dag, options):
         self.__meta_data = {}
 
         # Create a fileChecker object to be able to call filecheck methods
-        self.fileChecker = FileChecker()
+        self.fileChecker = FileChecker(self.options.input_file_name)
 
         # List of files modified by this job.
         self.modifiedFiles = []