From 94d06173305706e54cbf233f5f50204c3754d742 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Thu, 6 Dec 2018 15:13:50 +0300 Subject: more debug info on errors --- test.py | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'test.py') diff --git a/test.py b/test.py index e0a3bc24c..8eff1a9a8 100755 --- a/test.py +++ b/test.py @@ -137,15 +137,20 @@ def validateTestFile(testFile): def hashFile(fname): with open(fname ,"rb") as f: - k = sha3.keccak_256() - if fname.endswith(".json"): - s = json.dumps(json.load(f), sort_keys=True, separators=(',', ':')) - elif fname.endswith(".yml"): - s = json.dumps(yaml.load(f), sort_keys=True, separators=(',', ':')) - else: - _die("Do not know how to hash:", fname) - k.update(s.encode('utf-8')) - return k.hexdigest() + try: + k = sha3.keccak_256() + if fname.endswith(".json"): + s = json.dumps(json.load(f), sort_keys=True, separators=(',', ':')) + elif fname.endswith(".yml"): + s = json.dumps(yaml.load(f), sort_keys=True, separators=(',', ':')) + else: + _die("Do not know how to hash:", fname) + k.update(s.encode('utf-8')) + return { 'hash': k.hexdigest(), 'raw': s } + except Exception as e: + _logerror("Error getting hash of the yml/json:", fname) + _logerror("Exception: ", str(e)) + return { 'hash': 'error', 'raw': 'error' } def checkFilled(jsonFile): jsonTest = readFile(jsonFile) @@ -162,8 +167,9 @@ def checkFilled(jsonFile): if "_info" in jsonTest[test]: fillerSource = jsonTest[test]["_info"]["source"] fillerHash = jsonTest[test]["_info"]["sourceHash"] - if fillerHash != hashFile(fillerSource): - _logerror("Filler hash is different:", jsonFile) + resultHash = hashFile(fillerSource) + if fillerHash != resultHash['hash']: + _logerror("Filler hash is different:", jsonFile, " HashSrc: '", resultHash['raw'], "'") # Main # ==== -- cgit v1.2.3