Mercurial > hg > truffle
changeset 8206:22429580c7a8
sanitychecks.py: Collapse valueMaps in test for the case where multiple matcher return matches
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Thu, 07 Mar 2013 14:35:03 +0100 |
| parents | 9efef773f521 |
| children | ed880b9992b4 |
| files | mx/sanitycheck.py |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/sanitycheck.py Mon Mar 11 17:30:21 2013 +0100 +++ b/mx/sanitycheck.py Thu Mar 07 14:35:03 2013 +0100 @@ -270,9 +270,12 @@ if len(valueMaps) == 0: return False - assert len(valueMaps) == 1, 'Test matchers should not return more than one record' - - record = valueMaps[0] + record = {} + for valueMap in valueMaps: + for key, value in valueMap.items(): + if record.has_key(key) and record[key] != value: + mx.abort('Inconsistant values returned by test machers : ' + str(valueMaps)) + record[key] = value jvmErrorFile = record.get('jvmError') if jvmErrorFile: