on master help sign in
Merge pull request #744 from yesodweb/743-fix-ci

Add lower bound on http-types (fixes #743)

commit16af7026b7722f22340977f80ca8aa174c582ad0 authorMichael Snoyman <michael@snoyman.com> dateSun 28 Apr 2019, 18:23 (7 years ago) parent0e58be3f612eb3
4 files changed+4−11
stack-lts-6.yaml+1 stack-lts-9.yaml+1 warp/test/RunSpec.hs−9 warp/warp.cabal+2−2
stack-lts-6.yaml+1
@@ -18,6 +18,7 @@ extra-deps:
1818- psqueues-0.2.7.0@sha256:189970837d0aae01f48cd2a8aac6ce314191939e118cc0488aee1fb12da1956a,4757
1919- basement-0.0.7@rev:0
2020- http-client-0.5.13.1@rev:0
21+- http-types-0.12.3@rev:0
2122nix:
2223 enable: false
2324 packages:
stack-lts-9.yaml+1
@@ -14,6 +14,7 @@ extra-deps:
1414- streaming-commons-0.2.1.0@sha256:163af02944f374f316e35257c1afbffefd2c2852a85a151d1ea0ad22152cf28d,4990
1515- wai-logger-2.3.2@sha256:7f5dbc72c0753bd3e0e73f8f542d9d159d1d70f8ff3a3ec16d0b74b500534fc6,1572
1616- http-client-0.5.13.1@rev:0
17+- http-types-0.12.3@rev:0
1718nix:
1819 enable: false
1920 packages:
warp/test/RunSpec.hs−9
@@ -1,4 +1,3 @@
1−{-# LANGUAGE CPP #-}
21{-# LANGUAGE OverloadedStrings #-}
32{-# LANGUAGE ScopedTypeVariables #-}
43
@@ -300,8 +299,6 @@ spec = do
300299 [ "Hello World\nBye"
301300 , "Hello World"
302301 ]
303−#if !WINDOWS
304−-- Too slow on Windows
305302 it "lots of chunks" $ do
306303 ifront <- I.newIORef id
307304 countVar <- newTVarIO (0 :: Int)
@@ -351,7 +348,6 @@ spec = do
351348 [ "Hello World\nBye"
352349 , "Hello World"
353350 ]
354−#endif
355351 it "timeout in request body" $ do
356352 ifront <- I.newIORef id
357353 let app req f = do
@@ -399,10 +395,6 @@ spec = do
399395 timeout 100000 (msRead ms 10) >>= (`shouldBe` Just "1122334455")
400396 msWrite ms "67890"
401397 timeout 100000 (msRead ms 10) >>= (`shouldBe` Just "6677889900")
402−
403−#if !WINDOWS
404−-- No idea why this test is so unreliable on Windows
405−-- It fails in multiple ways on CI
406398 it "only one date and server header" $ do
407399 let app _ f = f $ responseLBS status200
408400 [ ("server", "server")
@@ -436,7 +428,6 @@ spec = do
436428 check $ count >= 1
437429 bs <- safeRecv sock 4096
438430 S.takeWhile (/= 13) bs `shouldBe` "HTTP/1.1 200 OK"
439−#endif
440431
441432 it "streaming response with length" $ do
442433 let app _ f = f $ responseStream status200 [("content-length", "20")] $ \write _ -> do
warp/warp.cabal+2−2
@@ -42,7 +42,7 @@ Library
4242 , case-insensitive >= 0.2
4343 , containers
4444 , ghc-prim
45− , http-types >= 0.9.1
45+ , http-types >= 0.11
4646 , iproute >= 1.3.1
4747 , http2 >= 1.6 && < 1.7
4848 , simple-sendfile >= 0.2.7 && < 0.3
@@ -180,7 +180,7 @@ Test-Suite spec
180180 Hs-Source-Dirs: test, .
181181 Type: exitcode-stdio-1.0
182182
183− Ghc-Options: -Wall
183+ Ghc-Options: -Wall -threaded
184184 Build-Depends: base >= 4.8 && < 5
185185 , array
186186 , auto-update