Merge pull request #4922 from haskell/cabal-install-2.0-last-minute-f…

…ixes Some minor fixes for the 2.0 branch
haskell · Dec 2, 2017 · 575be7f · 575be7f
2 parents 0395bf1 + 9ac2990
commit 575be7f
Show file tree

Hide file tree

Showing 5 changed files with 361 additions and 20 deletions.
diff --git a/Cabal/tests/UnitTests/Distribution/Compat/CreatePipe.hs b/Cabal/tests/UnitTests/Distribution/Compat/CreatePipe.hs
@@ -9,11 +9,11 @@ tests :: [TestTree]
 tests = [testCase "Locale Encoding" case_Locale_Encoding]
 
 case_Locale_Encoding :: Assertion
-case_Locale_Encoding = assert $ do
+case_Locale_Encoding = do
     let str = "\0252"
     (r, w) <- createPipe
     hSetEncoding w localeEncoding
     out <- hGetContents r
     hPutStr w str
     hClose w
-    return $! out == str
+    assertEqual "createPipe should support Unicode roundtripping" str out