Merge pull request #13966 from AttilaVamos/HPCC-24407-impr-7.10.x

HPCC-24407 Regression tests that fail should be meaningfully compared

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

testing/regress/hpcc/util/ecl/command.py

@@ -202,9 +202,15 @@ class ECLcmd(Shell):
                         eclfile.diff += data
                     test = True
                 elif (res['state'] == 'failed'):
-                    eclfile.diff = ("%3d. Test: %s\n") % (eclfile.taskId, eclfile.getBaseEclRealName())
-                    eclfile.diff += repr(data)
-                    test = False
+                    resultLines = data.strip().split('\n')
+                    resultLineIndex = 0;
+                    while not resultLines[resultLineIndex].startswith('<'):
+                        resultLineIndex += 1
+                    logging.debug("%3d. State is fail (resultLineIndex:%d, resultLines:'%s' )", eclfile.getTaskId(), resultLineIndex,  resultLines)
+                    data = '\n'.join(resultLines[resultLineIndex:])+ "\n"
+                    eclfile.addResults(data, wuid)
+                    logging.debug("%3d. State is fail (resultLineIndex:%d, data:'%s' )", eclfile.getTaskId(), resultLineIndex,  data)
+                    test = eclfile.testResults()
                 else:
                     test = eclfile.testResults()
             report.addResult(eclfile)

testing/regress/hpcc/util/ecl/file.py

@@ -278,6 +278,7 @@ class ECLFile:
         self.wuid = wuid.strip()
 
     def addResults(self, results, wuid):
+        logging.debug("%3d. addResults (results:'%s', wuid:'%s')", self.taskId, results,  wuid)
         filename = self.getResults()
         self.wuid = wuid
         if not os.path.isdir(self.dir_r):