From a474965a6563589c18d5456417d3aad97113b539 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Sat, 13 Jan 2024 16:04:11 -0500 Subject: [PATCH] Add skipping installed tests --- .../UnitTests/Distribution/Solver/Modular/Solver.hs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs b/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs index bf8f082e8..a77c25b8f 100644 --- a/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs +++ b/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs @@ -926,6 +926,16 @@ tests = solverFailure (\msg -> rejecting `isInfixOf` msg && skipping `isInfixOf` msg) , runTest $ let db = + [ Left $ exInst "A" 1 "A-1.0.0" [] + , Left $ exInst "A" 2 "A-2.0.0" [] + , Right $ exAv "B" 1 [ExFix "A" 3] + ] + rejecting = "rejecting: A-2.0.0" + skipping = "skipping: A-1.0.0" + in mkTest db "show skipping singleton, installed" ["B"] $ + solverFailure (\msg -> rejecting `isInfixOf` msg && skipping `isInfixOf` msg) + , runTest $ + let db = [ Right $ exAv "A" 1 [] , Right $ exAv "A" 2 [] , Right $ exAv "A" 3 [] @@ -935,6 +945,17 @@ tests = skipping = "skipping: A; 2.0.0, 1.0.0" in mkTest db "show skipping versions list" ["B"] $ solverFailure (\msg -> rejecting `isInfixOf` msg && skipping `isInfixOf` msg) + , runTest $ + let db = + [ Left $ exInst "A" 1 "A-1.0.0" [] + , Left $ exInst "A" 2 "A-2.0.0" [] + , Left $ exInst "A" 3 "A-3.0.0" [] + , Right $ exAv "B" 1 [ExFix "A" 4] + ] + rejecting = "rejecting: A-3.0.0" + skipping = "skipping: A-2.0.0/installed-2.0.0, A-1.0.0/installed-1.0.0" + in mkTest db "show skipping versions list, installed" ["B"] $ + solverFailure (\msg -> rejecting `isInfixOf` msg && skipping `isInfixOf` msg) ] ] ] -- 2.11.4.GIT