Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Normalize OS X specific pass/fail strings in approvals

Commit
2771a8ee9a5d5a25a4c52acdf026e5c16dece3c8
Author
Martin Hořeňovský ·
Parents
7abd7db2c8f0

Files · Download .tar.gz

Changes

 scripts/approvalTests.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
index 9ce927b6..3293c938 100755
--- a/scripts/approvalTests.py
+++ b/scripts/approvalTests.py
@@ -91,7 +91,7 @@ def diffFiles(fileA, fileB):
     return [line for line in diff if line[0] in ('+', '-')]
 
 
-def filterLine(line):
+def filterLine(line, isCompact):
     if catchPath in line:
         # make paths relative to Catch root
         line = line.replace(catchPath + os.sep, '')
@@ -109,6 +109,10 @@ def filterLine(line):
     else:
         line = lineNumberParser.sub(" ", line)
 
+    if isCompact:
+        line = line.replace(': FAILED', ': failed')
+        line = line.replace(': PASSED', ': passed')
+        
     # strip Catch version number
     line = versionParser.sub("<version>", line)
 
@@ -148,7 +152,7 @@ def approve(baseName, args):
     rawFile = io.open(rawResultsPath, 'r', encoding='utf-8', errors='surrogateescape')
     filteredFile = io.open(filteredResultsPath, 'w', encoding='utf-8', errors='surrogateescape')
     for line in rawFile:
-        filteredFile.write(filterLine(line).rstrip() + "\n")
+        filteredFile.write(filterLine(line, 'compact' in baseName).rstrip() + "\n")
     filteredFile.close()
     rawFile.close()