Skip to content

Commit 7e15d39

Browse files
authored
Warn about variable differences in MFiles (#3253)
1 parent 2e6d177 commit 7e15d39

File tree

1 file changed

+21
-14
lines changed

1 file changed

+21
-14
lines changed

tests/regression/test_process_input_files.py

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,25 @@ def compare(
9999
-1
100100
) == -2, f"ifail of {ifail} indicates PROCESS did not solve successfully"
101101

102+
mfile_keys = set(mfile.data.keys())
103+
reference_mfile_keys = set(reference_mfile.data.keys())
104+
key_mfile_not_ref = mfile_keys - reference_mfile_keys
105+
key_ref_not_mfile = reference_mfile_keys - mfile_keys
106+
107+
key_ref_not_mfile_msg = (
108+
"\033[35m Reference MFile contains variables that are not present in "
109+
f"the MFILE: {key_ref_not_mfile} \033[0m"
110+
)
111+
if key_ref_not_mfile:
112+
logger.warning(key_ref_not_mfile_msg)
113+
114+
key_mfile_not_ref_msg = (
115+
"\033[35m MFile contains variables that are not present in "
116+
f"the reference MFILE: {key_mfile_not_ref} \033[0m"
117+
)
118+
if key_mfile_not_ref:
119+
logger.warning(key_mfile_not_ref_msg)
120+
102121
differences = self.mfile_value_changes(
103122
reference_mfile, mfile, tolerance, opt_params_only
104123
)
@@ -121,20 +140,8 @@ def compare(
121140
"for some of the variables. See the warnings for a breakdown of the differences."
122141
)
123142

124-
mfile_keys = set(mfile.data.keys())
125-
reference_mfile_keys = set(reference_mfile.data.keys())
126-
key_mfile_not_ref = mfile_keys - reference_mfile_keys
127-
key_ref_not_mfile = reference_mfile_keys - mfile_keys
128-
129-
assert not key_ref_not_mfile, (
130-
"Reference MFile contains variables that are not present in "
131-
f"the MFILE: {key_ref_not_mfile}"
132-
)
133-
134-
assert not key_mfile_not_ref, (
135-
"MFile contains variables that are not present in "
136-
f"the reference MFILE: {key_mfile_not_ref}"
137-
)
143+
assert not key_ref_not_mfile, key_ref_not_mfile_msg
144+
assert not key_mfile_not_ref, key_mfile_not_ref_msg
138145

139146
@staticmethod
140147
def mfile_value_changes(

0 commit comments

Comments
 (0)