From c9ee431c2b3e27f59d0bef9baf6fa18d59c16dc2 Mon Sep 17 00:00:00 2001
From: Phil de Joux <philderbeast@gmail.com>
Date: Mon, 1 Jan 2024 11:13:26 -0500
Subject: [PATCH] Update expectations of cabal-install:unit-tests
---
.../tests/UnitTests/Distribution/Solver/Modular/Solver.hs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs b/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs
index 123979921b..7581c2a797 100644
--- a/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs
+++ b/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs
@@ -615,7 +615,7 @@ tests =
, "[__2] unknown package: unknown2 (dependency of B)"
, "[__2] fail (backjumping, conflict set: B, unknown2)"
, "[__1] fail (backjumping, conflict set: A, B, unknown1, unknown2)"
- , "[__0] skipping: A-3.0.0, A-2.0.0 (has the same characteristics that "
+ , "[__0] skipping: A; 3.0.0, 2.0.0 (has the same characteristics that "
++ "caused the previous version to fail: depends on 'B')"
, "[__0] trying: A-1.0.0"
, "[__1] done"
@@ -644,7 +644,7 @@ tests =
, "[__1] next goal: B (dependency of A)"
, "[__1] rejecting: B-11.0.0 (conflict: A => B==14.0.0)"
, "[__1] fail (backjumping, conflict set: A, B)"
- , "[__0] skipping: A-3.0.0, A-2.0.0 (has the same characteristics that "
+ , "[__0] skipping: A; 3.0.0, 2.0.0 (has the same characteristics that "
++ "caused the previous version to fail: depends on 'B' but excludes "
++ "version 11.0.0)"
, "[__0] trying: A-1.0.0"
@@ -769,7 +769,7 @@ tests =
, "[__2] next goal: C (dependency of A)"
, "[__2] rejecting: C-2.0.0 (conflict: A => C==1.0.0)"
, "[__2] fail (backjumping, conflict set: A, C)"
- , "[__0] skipping: A-3.0.0, A-2.0.0 (has the same characteristics that caused the "
+ , "[__0] skipping: A; 3.0.0, 2.0.0 (has the same characteristics that caused the "
++ "previous version to fail: depends on 'C' but excludes version 2.0.0)"
, "[__0] trying: A-1.0.0"
, "[__1] next goal: C (dependency of A)"
--
GitLab