Fix error parsing

extensions
Volodymyr Shymanskyy 5 years ago
parent 7f3561ebad
commit deb79bbacf

@ -130,7 +130,7 @@ def runInvoke(test):
if len(result) == 1: if len(result) == 1:
actual = "trap " + result[0] actual = "trap " + result[0]
if not actual: if not actual:
result = re.findall(r'^Error: (.*?) \(', "\n" + output + "\n", re.MULTILINE) result = re.findall(r'^Error: (.*?)$', "\n" + output + "\n", re.MULTILINE)
if len(result) == 1: if len(result) == 1:
actual = "error " + result[0] actual = "error " + result[0]
if not actual: if not actual:
@ -209,8 +209,12 @@ for fn in jsonFiles:
if test.type == "assert_return": if test.type == "assert_return":
test.expected = cmd["expected"] test.expected = cmd["expected"]
if test.type == "assert_trap": elif test.type == "assert_trap":
test.expected_trap = cmd["text"] test.expected_trap = cmd["text"]
else:
stats.skipped += 1
warning(f"skipped {test.source} {test.type}")
continue
test.action = dotdict(cmd["action"]) test.action = dotdict(cmd["action"])
if test.action.type == "invoke": if test.action.type == "invoke":

Loading…
Cancel
Save