Skip to content

Commit cb41f04

Browse files
committed
Adjust expected test output
1 parent 04aa087 commit cb41f04

File tree

1 file changed

+5
-5
lines changed
  • cabal-install/tests/UnitTests/Distribution/Solver/Modular

1 file changed

+5
-5
lines changed

cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ tests =
623623
, "[__2] unknown package: unknown2 (dependency of B)"
624624
, "[__2] fail (backjumping, conflict set: B, unknown2)"
625625
, "[__1] fail (backjumping, conflict set: A, B, unknown1, unknown2)"
626-
, "[__0] skipping: A; 3.0.0, 2.0.0 (has the same characteristics that "
626+
, "[__0] skipping: A; 2.0.0, 3.0.0 (has the same characteristics that "
627627
++ "caused the previous version to fail: depends on 'B')"
628628
, "[__0] trying: A-1.0.0"
629629
, "[__1] done"
@@ -652,7 +652,7 @@ tests =
652652
, "[__1] next goal: B (dependency of A)"
653653
, "[__1] rejecting: B-11.0.0 (conflict: A => B==14.0.0)"
654654
, "[__1] fail (backjumping, conflict set: A, B)"
655-
, "[__0] skipping: A; 3.0.0, 2.0.0 (has the same characteristics that "
655+
, "[__0] skipping: A; 2.0.0, 3.0.0 (has the same characteristics that "
656656
++ "caused the previous version to fail: depends on 'B' but excludes "
657657
++ "version 11.0.0)"
658658
, "[__0] trying: A-1.0.0"
@@ -777,7 +777,7 @@ tests =
777777
, "[__2] next goal: C (dependency of A)"
778778
, "[__2] rejecting: C-2.0.0 (conflict: A => C==1.0.0)"
779779
, "[__2] fail (backjumping, conflict set: A, C)"
780-
, "[__0] skipping: A; 3.0.0, 2.0.0 (has the same characteristics that caused the "
780+
, "[__0] skipping: A; 2.0.0, 3.0.0 (has the same characteristics that caused the "
781781
++ "previous version to fail: depends on 'C' but excludes version 2.0.0)"
782782
, "[__0] trying: A-1.0.0"
783783
, "[__1] next goal: C (dependency of A)"
@@ -950,7 +950,7 @@ tests =
950950
, Right $ exAv "B" 1 [ExFix "A" 4]
951951
]
952952
rejecting = "rejecting: A-3.0.0"
953-
skipping = "skipping: A; 2.0.0, 1.0.0"
953+
skipping = "skipping: A; 1.0.0, 2.0.0"
954954
in mkTest db "show skipping versions list" ["B"] $
955955
solverFailure (\msg -> rejecting `isInfixOf` msg && skipping `isInfixOf` msg)
956956
, runTest $
@@ -961,7 +961,7 @@ tests =
961961
, Right $ exAv "B" 1 [ExFix "A" 4]
962962
]
963963
rejecting = "rejecting: A-3.0.0/installed-3.0.0"
964-
skipping = "skipping: A; 2.0.0/installed-2.0.0, 1.0.0/installed-1.0.0"
964+
skipping = "skipping: A; 1.0.0/installed-1.0.0, 2.0.0/installed-2.0.0"
965965
in mkTest db "show skipping versions list, installed" ["B"] $
966966
solverFailure (\msg -> rejecting `isInfixOf` msg && skipping `isInfixOf` msg)
967967
]

0 commit comments

Comments
 (0)