LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

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

Browse source 
6c5cd9d test: Add format-dependent comparison to bctest (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2016-11-02 11:15:32 +01:00
commit 6a8be7ba99
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/test/bctest.py
View file

@ -6,6 +6,15 @@ import subprocess
import os import os
import json import json
import sys 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): def bctest(testDir, testObj, exeext):
@ -23,6 +32,7 @@ def bctest(testDir, testObj, exeext):
outputData = None outputData = None
if "output_cmp" in testObj: if "output_cmp" in testObj:
outputFn = testObj['output_cmp'] 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() outputData = open(testDir + "/" + outputFn).read()
if not outputData: if not outputData:
print("Output data missing for " + outputFn) print("Output data missing for " + outputFn)
@ -34,9 +44,23 @@ def bctest(testDir, testObj, exeext):
print("OSError, Failed to execute " + execprog) print("OSError, Failed to execute " + execprog)
sys.exit(1) sys.exit(1)
if outputData and (outs[0] != outputData): if outputData:
print("Output data mismatch for " + outputFn) try:
sys.exit(1) 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 wantRC = 0
if "return_code" in testObj: if "return_code" in testObj: