From 72515dcc9967842111bb1e060b210e2bb8d6107a Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 9 Dec 2013 01:36:24 +0000 Subject: [PATCH] [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. --- test_problems/SConscript | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test_problems/SConscript b/test_problems/SConscript index f1c688f4e..7250d71bc 100644 --- a/test_problems/SConscript +++ b/test_problems/SConscript @@ -251,8 +251,7 @@ diamond_name = diamond[0].name Test('diamondSurf-xml', 'diamondSurf', diamond, 'runDiamond_blessed.out', options='diamond_blessed.xml', artifacts=diamond_name) Test('diamondSurf-cti', 'diamondSurf', diamond, 'runDiamond_blessed.out', - options='diamond.cti', artifacts=diamond_name, - comparisons=[('diamond_blessed.xml', 'diamond.xml')]) + options='diamond.cti', artifacts=diamond_name) CompileAndTest('dustyGasTransport', 'dustyGasTransport', 'dustyGasTransport', 'output_blessed.txt') CompileAndTest('fracCoeff', 'fracCoeff', 'fracCoeff', 'frac_blessed.out') @@ -269,8 +268,7 @@ negA_name = negA[0].name Test('negA-xml', 'negATest', negA, 'negATest_blessed.out', options='noxNeg_blessed.xml', artifacts=negA_name) Test('negA-cti', 'negATest', negA, 'negATest_blessed.out', - options='noxNeg.cti', artifacts=negA_name, - comparisons=[('noxNeg_blessed.xml', 'noxNeg.xml')]) + options='noxNeg.cti', artifacts=negA_name) CompileAndTest('pecosTransport', 'PecosTransport', 'pecosTransport', 'output_blessed.txt') CompileAndTest('printUtil', 'printUtilUnitTest', 'pUtest', 'output_blessed.txt')