tests: Fixes to expected message strings

erikd · erikd · commit ef994c52bdff · 2025-06-13T16:43:39.000+10:00
These fixes are require due to improvements in solver error reporting.
diff --git a/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs b/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs
@@ -208,7 +208,7 @@ tests =
               solverSuccess [("base", 1), ("ghc-prim", 1), ("integer-gmp", 1), ("integer-simple", 1)]
       , runTest $
           mkTest dbNonupgrade "Refuse to install newer ghc requested by another library" ["A"] $
-            solverFailure (isInfixOf "rejecting: ghc-2.0.0 (constraint from non-reinstallable package requires installed instance)")
+            solverFailure (isInfixOf "rejecting: ghc-1.0.0/installed-1 (conflict: A => ghc==2.0.0)")
       ]
   , testGroup
       "reject-unconstrained"

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ tests =`
`208`	`208`	`solverSuccess [("base", 1), ("ghc-prim", 1), ("integer-gmp", 1), ("integer-simple", 1)]`
`209`	`209`	`, runTest $`
`210`	`210`	`mkTest dbNonupgrade "Refuse to install newer ghc requested by another library" ["A"] $`
`211`		`- solverFailure (isInfixOf "rejecting: ghc-2.0.0 (constraint from non-reinstallable package requires installed instance)")`
	`211`	`+ solverFailure (isInfixOf "rejecting: ghc-1.0.0/installed-1 (conflict: A => ghc==2.0.0)")`
`212`	`212`	`]`
`213`	`213`	`, testGroup`
`214`	`214`	`"reject-unconstrained"`