Skip to content
Permalink
Browse files

Merge #9032: test: Add format-dependent comparison to bctest

6c5cd9d test: Add format-dependent comparison to bctest (Wladimir J. van der Laan)
  • Loading branch information...
laanwj committed Nov 2, 2016
2 parents 101c642 + 6c5cd9d commit 6a8be7ba999ad6a948b9a7c5d2f614b919fb6b8e
Showing with 27 additions and 3 deletions.
  1. +27 −3 src/test/bctest.py
@@ -6,6 +6,15 @@
import os
import json
import sys
import binascii

def parse_output(a, fmt):
if fmt == 'json': # json: compare parsed data
return json.loads(a)
elif fmt == 'hex': # hex: parse and compare binary data
return binascii.a2b_hex(a.strip())
else:
raise NotImplementedError("Don't know how to compare %s" % fmt)

def bctest(testDir, testObj, exeext):

@@ -23,6 +32,7 @@ def bctest(testDir, testObj, exeext):
outputData = None
if "output_cmp" in testObj:
outputFn = testObj['output_cmp']
outputType = os.path.splitext(outputFn)[1][1:] # output type from file extension (determines how to compare)
outputData = open(testDir + "/" + outputFn).read()
if not outputData:
print("Output data missing for " + outputFn)
@@ -34,9 +44,23 @@ def bctest(testDir, testObj, exeext):
print("OSError, Failed to execute " + execprog)
sys.exit(1)

if outputData and (outs[0] != outputData):
print("Output data mismatch for " + outputFn)
sys.exit(1)
if outputData:
try:
a_parsed = parse_output(outs[0], outputType)
except Exception as e:
print('Error parsing command output as %s: %s' % (outputType,e))
sys.exit(1)
try:
b_parsed = parse_output(outputData, outputType)
except Exception as e:
print('Error parsing expected output %s as %s: %s' % (outputFn,outputType,e))
sys.exit(1)
if a_parsed != b_parsed:
print("Output data mismatch for " + outputFn + " (format " + outputType + ")")
sys.exit(1)
if outs[0] != outputData:
print("Output formatting mismatch for " + outputFn + " (format " + outputType + ")")
sys.exit(1)

wantRC = 0
if "return_code" in testObj:

0 comments on commit 6a8be7b

Please sign in to comment.
You can’t perform that action at this time.