From 79944b3aab1b704ada4566ee9e9dd8bd263a2495 Mon Sep 17 00:00:00 2001
From: odow <o.dowson@gmail.com>
Date: Tue, 5 Aug 2025 13:25:22 +1200
Subject: [PATCH] [Utilities] fix backwards compat of ConflictCount in
 MockOptimizer

---
 src/Utilities/mockoptimizer.jl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Utilities/mockoptimizer.jl b/src/Utilities/mockoptimizer.jl
index a6102c5d06..682867a2fa 100644
--- a/src/Utilities/mockoptimizer.jl
+++ b/src/Utilities/mockoptimizer.jl
@@ -319,6 +319,12 @@ function MOI.set(
     ::MOI.ConflictStatus,
     value::MOI.ConflictStatusCode,
 )
+    if value == MOI.CONFLICT_FOUND && mock.conflict_count == 0
+        # A backwards compatible change for JuMP, which set MOI.ConflictStatus
+        # in its tests without setting MOI.ConflictCount (because the test was
+        # writte prior to the introduction of MOI.ConflictCount).
+        mock.conflict_count = 1
+    end
     mock.conflict_status = value
     return
 end