X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=blobdiff_plain;f=driver.py;h=39d7420c4e9e4853d47f33f592d94580f51e1200;hp=871ef097ec63cc7a1f115d40f23800aa69f72760;hb=195b2e54eda22ea844af868ac6990c45e8772d37;hpb=d228816324291469b3724e52ad33e85529a700f1 diff --git a/driver.py b/driver.py index 871ef09..39d7420 100755 --- a/driver.py +++ b/driver.py @@ -305,7 +305,7 @@ class TestCase: def checkState(self, callNo, refStateFileName): srcState = self.getState(callNo) - refState = json.load(open(refStateFileName, 'rt'), strict=False) + refState = self.getRefState(refStateFileName) from jsondiff import Comparer, Differ comparer = Comparer(ignore_added = True) @@ -321,6 +321,14 @@ class TestCase: differ.visit(refState, srcState) fail('state from call %u does not match %s' % (callNo, refStateFileName)) + # Allo non-standard JS comments in JSON + json_comment_re = re.compile(r'//.*$', re.MULTILINE) + + def getRefState(self, refStateFileName): + data = open(refStateFileName, 'rt').read() + data = self.json_comment_re.sub('', data) + return json.loads(data, strict=False) + def getNamePrefix(self): name = os.path.basename(self.ref_dump) try: