Skip to content

Commit 0a9d56c

Browse files
committed
client tests changes 2
1 parent d579eeb commit 0a9d56c

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

tests/clicast-server/client.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,22 @@ def compareJSON(left, right):
142142

143143
def compareTestScriptFiles(expected, actual):
144144
"""
145-
Compare two test scripts, ignoring the first line (the vcast version stamp).
145+
Compare two test scripts, ignoring:
146+
- the first line (the vcast version stamp), and
147+
- TEST.SCRIPT_FEATURE: lines, which are release-level capability flags
148+
that newer VectorCAST versions add/remove independent of test content.
146149
On mismatch, print a unified diff so CI logs show exactly what changed.
147150
"""
148151
import difflib
149152

150-
with open(expected, "r") as f:
151-
expectedLines = f.readlines()[1:]
152-
with open(actual, "r") as f:
153-
actualLines = f.readlines()[1:]
153+
def normalize(path):
154+
with open(path, "r") as f:
155+
lines = f.readlines()[1:] # drop version-stamp first line
156+
# drop release-metadata feature flags
157+
return [ln for ln in lines if not ln.startswith("TEST.SCRIPT_FEATURE:")]
158+
159+
expectedLines = normalize(expected)
160+
actualLines = normalize(actual)
154161

155162
returnValue = expectedLines == actualLines
156163

@@ -168,7 +175,6 @@ def compareTestScriptFiles(expected, actual):
168175

169176
return returnValue
170177

171-
172178
def compareToExpected(expectedFile, newData):
173179

174180
expectedFilePath = os.path.join(thisFileLocation, "expected-files", expectedFile)

0 commit comments

Comments
 (0)