QPR-12276 do not require equal optional cols

Author: pcaspers

Tools/PythonTools/compare_files.py

@@ -401,14 +401,23 @@ def compare_files_df(name, file_1, file_2, config):
             optional_cols = copy.deepcopy(config['optional_cols'])
             logger.debug('Optional columns found: %s', str (optional_cols))
 
-            # Check that each optional col either exists in both DataFrames, or is missing in both. Otherwise, we fail the test.
+            # Check that each optional col either exists in both DataFrames, or is missing in both. Otherwise, we fail the test
+            # if require_equal_optional_cols is true (or not given)
             missing_ocols = []
             for col in optional_cols:
                 if (col in df_1.columns and col not in df_2.columns) or (col not in df_1.columns and col in df_2.columns):
                     missing_ocols.append(col)
             if missing_ocols:
                 logger.warning('The columns, %s, are in one Dataframe but not the other.', str(missing_ocols))
-                return False
+                if 'require_equal_optional_cols' in config:
+                    if config['require_equal_optional_cols']:
+                        logger.warning('Failing test, because require_equal_optional_cols is true')
+                        return False
+                    else:
+                        logger.warning('Ignore unequal optional cols, because because require_equal_optional_cols is false')
+                else:
+                    logger.warning('Failing test, because require_equal_optional_cols is not given, defaults to true')
+                    return False
 
             # For each optional col, check whether it is found in each DataFrame. If so, add it.
             for col in optional_cols:

Tools/PythonTools/comparison_config.json

@@ -921,6 +921,7 @@
           "ShiftSize_1",
           "ShiftSize_2"
         ],
+        "require_equal_optional_cols": false,
         "column_settings": [
           {
             "names": [