Merge pull request #2412 from jmchilton/2409_followup

Follow up on @nsoranzo comment...
This commit is contained in:
Martin Cech
2016-05-25 14:26:03 -04:00
+1 -6
View File
@@ -441,12 +441,7 @@ def __parse_test_attributes( output_elem, attrib, parse_elements=False ):
# Allow either file or value to specify a target file to compare result with
# file was traditionally used by outputs and value by extra files.
if 'file' in attrib:
file = attrib.pop( 'file', None )
elif 'value' in attrib:
file = attrib.pop( 'value', None )
else:
file = None
file = attrib.pop( 'file', attrib.pop( 'value', None ) )
# File no longer required if an list of assertions was present.
attributes = {}