From b0938fb6f177bf833bbec86a6dc51102bdfe09df Mon Sep 17 00:00:00 2001 From: Kirill Zaborsky Date: Tue, 20 Nov 2018 11:45:10 +0300 Subject: [PATCH] Use default resolver for test 4101-dependency-tree --- .../tests/4101-dependency-tree/Main.hs | 20 +++++++++---------- .../4101-dependency-tree/files/stack.yaml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/integration/tests/4101-dependency-tree/Main.hs b/test/integration/tests/4101-dependency-tree/Main.hs index 5752cad7f0..11e1c39cee 100644 --- a/test/integration/tests/4101-dependency-tree/Main.hs +++ b/test/integration/tests/4101-dependency-tree/Main.hs @@ -6,22 +6,22 @@ main = do stackCheckStdout ["ls", "dependencies", "--tree"] $ \stdOut -> do let expected = unlines [ "Packages" , "└─┬ files mkVersion [0,1,0,0]" - , " ├─┬ base mkVersion [4,11,1,0]" - , " │ ├─┬ ghc-prim mkVersion [0,5,2,0]" + , " ├─┬ base mkVersion [4,10,1,0]" + , " │ ├─┬ ghc-prim mkVersion [0,5,1,1]" , " │ │ └── rts mkVersion [1,0]" - , " │ ├─┬ integer-gmp mkVersion [1,0,2,0]" - , " │ │ └─┬ ghc-prim mkVersion [0,5,2,0]" + , " │ ├─┬ integer-gmp mkVersion [1,0,1,0]" + , " │ │ └─┬ ghc-prim mkVersion [0,5,1,1]" , " │ │ └── rts mkVersion [1,0]" , " │ └── rts mkVersion [1,0]" , " └─┬ mtl mkVersion [2,2,2]" - , " ├─┬ base mkVersion [4,11,1,0]" - , " │ ├─┬ ghc-prim mkVersion [0,5,2,0]" + , " ├─┬ base mkVersion [4,10,1,0]" + , " │ ├─┬ ghc-prim mkVersion [0,5,1,1]" , " │ │ └── rts mkVersion [1,0]" - , " │ ├─┬ integer-gmp mkVersion [1,0,2,0]" - , " │ │ └─┬ ghc-prim mkVersion [0,5,2,0]" + , " │ ├─┬ integer-gmp mkVersion [1,0,1,0]" + , " │ │ └─┬ ghc-prim mkVersion [0,5,1,1]" , " │ │ └── rts mkVersion [1,0]" , " │ └── rts mkVersion [1,0]" - , " └── transformers mkVersion [0,5,5,0]" + , " └── transformers mkVersion [0,5,2,0]" ] when (stdOut /= expected) $ error $ unlines [ "Expected:", expected, "Actual:", stdOut ] @@ -29,7 +29,7 @@ main = do stackCheckStdout ["ls", "dependencies", "--tree", "--depth=1"] $ \stdOut -> do let expected = unlines [ "Packages" , "└─┬ files mkVersion [0,1,0,0]" - , " ├── base mkVersion [4,11,1,0]" + , " ├── base mkVersion [4,10,1,0]" , " └── mtl mkVersion [2,2,2]" ] when (stdOut /= expected) $ diff --git a/test/integration/tests/4101-dependency-tree/files/stack.yaml b/test/integration/tests/4101-dependency-tree/files/stack.yaml index 3e184f846f..c45908a037 100644 --- a/test/integration/tests/4101-dependency-tree/files/stack.yaml +++ b/test/integration/tests/4101-dependency-tree/files/stack.yaml @@ -1,3 +1,3 @@ -resolver: lts-12.14 +resolver: lts-11.22 packages: - .