[Test] Eliminate text-based comparison of XML files

The order of XML attributes within a node has no meaning, and is not
consistent when the attributes are represented as a Python dict, as in
ctml_writer.py. As a result, comparing the text representation of the
XML generates spurious errors when the order changes.
This commit is contained in:
Ray Speth 2013-12-09 01:36:24 +00:00
parent f63f8ae57e
commit 72515dcc99

View file

@ -251,8 +251,7 @@ diamond_name = diamond[0].name
Test('diamondSurf-xml', 'diamondSurf', diamond, 'runDiamond_blessed.out', Test('diamondSurf-xml', 'diamondSurf', diamond, 'runDiamond_blessed.out',
options='diamond_blessed.xml', artifacts=diamond_name) options='diamond_blessed.xml', artifacts=diamond_name)
Test('diamondSurf-cti', 'diamondSurf', diamond, 'runDiamond_blessed.out', Test('diamondSurf-cti', 'diamondSurf', diamond, 'runDiamond_blessed.out',
options='diamond.cti', artifacts=diamond_name, options='diamond.cti', artifacts=diamond_name)
comparisons=[('diamond_blessed.xml', 'diamond.xml')])
CompileAndTest('dustyGasTransport', 'dustyGasTransport', 'dustyGasTransport', CompileAndTest('dustyGasTransport', 'dustyGasTransport', 'dustyGasTransport',
'output_blessed.txt') 'output_blessed.txt')
CompileAndTest('fracCoeff', 'fracCoeff', 'fracCoeff', 'frac_blessed.out') CompileAndTest('fracCoeff', 'fracCoeff', 'fracCoeff', 'frac_blessed.out')
@ -269,8 +268,7 @@ negA_name = negA[0].name
Test('negA-xml', 'negATest', negA, 'negATest_blessed.out', Test('negA-xml', 'negATest', negA, 'negATest_blessed.out',
options='noxNeg_blessed.xml', artifacts=negA_name) options='noxNeg_blessed.xml', artifacts=negA_name)
Test('negA-cti', 'negATest', negA, 'negATest_blessed.out', Test('negA-cti', 'negATest', negA, 'negATest_blessed.out',
options='noxNeg.cti', artifacts=negA_name, options='noxNeg.cti', artifacts=negA_name)
comparisons=[('noxNeg_blessed.xml', 'noxNeg.xml')])
CompileAndTest('pecosTransport', 'PecosTransport', 'pecosTransport', 'output_blessed.txt') CompileAndTest('pecosTransport', 'PecosTransport', 'pecosTransport', 'output_blessed.txt')
CompileAndTest('printUtil', 'printUtilUnitTest', 'pUtest', 'output_blessed.txt') CompileAndTest('printUtil', 'printUtilUnitTest', 'pUtest', 'output_blessed.txt')