haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-30 16:10:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some test fixes

Browse Source
This commit is contained in:
Michael Snoyman 2014-04-04 10:14:23 +03:00
parent ef84d1201a
commit 4dafa9471e
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Stackage/Config.hs
View File

@ -134,6 +134,8 @@ defaultExpectedFailures ghcVer = execWriter $ do
, "profunctor-extras semigroupoid-extras" , "profunctor-extras semigroupoid-extras"
, "conduit-extra hamlet shakespeare-css shakespeare-i18n" , "conduit-extra hamlet shakespeare-css shakespeare-i18n"
, "shakespeare-js shakespeare-text" , "shakespeare-js shakespeare-text"
, "attoparsec-conduit blaze-builder-conduit http-client-conduit"
, "network-conduit zlib-conduit http-client-multipart"
] ]
-- Cloud Haskell tests seem to be unreliable -- Cloud Haskell tests seem to be unreliable

20
patching/patches/gitlib-s3-3.0.1.patch
View File

@ -1,6 +1,6 @@
diff -ru orig/Git/S3.hs new/Git/S3.hs diff -ru orig/Git/S3.hs new/Git/S3.hs
--- orig/Git/S3.hs 2014-04-04 06:49:18.680668125 +0300 --- orig/Git/S3.hs 2014-04-04 10:00:47.080423588 +0300
+++ new/Git/S3.hs 2014-04-04 06:49:18.000000000 +0300 +++ new/Git/S3.hs 2014-04-04 10:00:46.000000000 +0300
@@ -467,7 +467,10 @@ @@ -467,7 +467,10 @@
-> ResourceT m (Response (ResponseMetadata a) a) -> ResourceT m (Response (ResponseMetadata a) a)
awsRetry cfg svcfg mgr r = awsRetry cfg svcfg mgr r =
@ -203,8 +203,8 @@ diff -ru orig/Git/S3.hs new/Git/S3.hs
-> Git.RepositoryFactory (ReaderT LgRepo m) m LgRepo -> Git.RepositoryFactory (ReaderT LgRepo m) m LgRepo
s3FactoryLogger bucket accessKey secretKey dir callbacks = lgFactoryLogger s3FactoryLogger bucket accessKey secretKey dir callbacks = lgFactoryLogger
diff -ru orig/gitlib-s3.cabal new/gitlib-s3.cabal diff -ru orig/gitlib-s3.cabal new/gitlib-s3.cabal
--- orig/gitlib-s3.cabal 2014-04-04 06:49:18.680668125 +0300 --- orig/gitlib-s3.cabal 2014-04-04 10:00:47.084423588 +0300
+++ new/gitlib-s3.cabal 2014-04-04 06:49:18.000000000 +0300 +++ new/gitlib-s3.cabal 2014-04-04 10:00:46.000000000 +0300
@@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@
, binary >= 0.5.1.0 , binary >= 0.5.1.0
, bytestring >= 0.9.2.1 , bytestring >= 0.9.2.1
@ -213,3 +213,15 @@ diff -ru orig/gitlib-s3.cabal new/gitlib-s3.cabal
, data-default >= 0.5.1 , data-default >= 0.5.1
, directory >= 1.1.0.2 , directory >= 1.1.0.2
, filepath >= 1.3.0 , filepath >= 1.3.0
diff -ru orig/test/Smoke.hs new/test/Smoke.hs
--- orig/test/Smoke.hs 2014-04-04 10:00:47.080423588 +0300
+++ new/test/Smoke.hs 2014-04-04 10:00:46.000000000 +0300
@@ -31,7 +31,7 @@
s3Factory
:: (Failure Git.GitException m, MonadIO m, MonadBaseControl IO m,
- MonadUnsafeIO m, MonadThrow m)
+ MonadThrow m)
=> Git.RepositoryFactory (ReaderT Lg.LgRepo (NoLoggingT m)) m Lg.LgRepo
s3Factory = Lg.lgFactory
{ Git.runRepository = \ctxt m ->

21
patching/patches/process-conduit-1.1.0.0.patch Normal file
View File

@ -0,0 +1,21 @@
diff -ru orig/process-conduit.cabal new/process-conduit.cabal
--- orig/process-conduit.cabal 2014-04-04 10:13:39.716407142 +0300
+++ new/process-conduit.cabal 2014-04-04 10:13:39.000000000 +0300
@@ -48,4 +48,6 @@
, bytestring
, hspec >= 1.3
, conduit
+ , conduit-extra
+ , resourcet
, process-conduit
diff -ru orig/test.hs new/test.hs
--- orig/test.hs 2014-04-04 10:13:39.692407142 +0300
+++ new/test.hs 2014-04-04 10:13:39.000000000 +0300
@@ -5,6 +5,7 @@
import qualified Data.ByteString.Lazy.Char8 as L
import Data.Conduit
+import Control.Monad.Trans.Resource (runResourceT)
import qualified Data.Conduit.Binary as CB
import Test.Hspec