diff --git a/test/check_equal_csv.py b/test/check_equal_csv.py index 7f71764090..a53e298eb3 100755 --- a/test/check_equal_csv.py +++ b/test/check_equal_csv.py @@ -47,7 +47,7 @@ def remove_run_time(df): different_columns = [] all_columns = set(goal_df.columns) | set(actual_df.columns) for col in all_columns: - if "intellimerge" in col or "run_time" in col: + if "intellimerge" in col or "run_time" in col or "resolve" in col: continue if col not in goal_df: print(f"Column {col} is in actual_df but not in goal_df") @@ -65,7 +65,7 @@ def remove_run_time(df): raise ValueError("goal_df and actual_df have different columns or values") for col in goal_df.columns: - if "intellimerge" in col: + if "intellimerge" in col or "resolve" in col: continue # Check if the columns are equal if actual_df[col].equals(goal_df[col]):