git.iko.soy/stackage
on master help sign in
Some test fixes
4dafa94Michael Snoyman
Stackage/Config.hs+2
compare with master
unifiedsplit
@@ -134,6 +134,8 @@ defaultExpectedFailures ghcVer = execWriter $ do
134 , "profunctor-extras semigroupoid-extras"
134 , "profunctor-extras semigroupoid-extras"
135 , "conduit-extra hamlet shakespeare-css shakespeare-i18n"
135 , "conduit-extra hamlet shakespeare-css shakespeare-i18n"
136 , "shakespeare-js shakespeare-text"
136 , "shakespeare-js shakespeare-text"
137+ , "attoparsec-conduit blaze-builder-conduit http-client-conduit"
138+ , "network-conduit zlib-conduit http-client-multipart"
137 ]
139 ]
138
140
139 -- Cloud Haskell tests seem to be unreliable
141 -- Cloud Haskell tests seem to be unreliable
patching/patches/gitlib-s3-3.0.1.patch+16−4
@@ -1,6 +1,6 @@
1diff -ru orig/Git/S3.hs new/Git/S3.hs
1diff -ru orig/Git/S3.hs new/Git/S3.hs
2−--- orig/Git/S3.hs 2014-04-04 06:49:18.680668125 +0300
2+--- orig/Git/S3.hs 2014-04-04 10:00:47.080423588 +0300
3−+++ new/Git/S3.hs 2014-04-04 06:49:18.000000000 +0300
3++++ new/Git/S3.hs 2014-04-04 10:00:46.000000000 +0300
4@@ -467,7 +467,10 @@
4@@ -467,7 +467,10 @@
5 -> ResourceT m (Response (ResponseMetadata a) a)
5 -> ResourceT m (Response (ResponseMetadata a) a)
6 awsRetry cfg svcfg mgr r =
6 awsRetry cfg svcfg mgr r =
@@ -203,8 +203,8 @@ diff -ru orig/Git/S3.hs new/Git/S3.hs
203 -> Git.RepositoryFactory (ReaderT LgRepo m) m LgRepo
203 -> Git.RepositoryFactory (ReaderT LgRepo m) m LgRepo
204 s3FactoryLogger bucket accessKey secretKey dir callbacks = lgFactoryLogger
204 s3FactoryLogger bucket accessKey secretKey dir callbacks = lgFactoryLogger
205diff -ru orig/gitlib-s3.cabal new/gitlib-s3.cabal
205diff -ru orig/gitlib-s3.cabal new/gitlib-s3.cabal
206−--- orig/gitlib-s3.cabal 2014-04-04 06:49:18.680668125 +0300
206+--- orig/gitlib-s3.cabal 2014-04-04 10:00:47.084423588 +0300
207−+++ new/gitlib-s3.cabal 2014-04-04 06:49:18.000000000 +0300
207++++ new/gitlib-s3.cabal 2014-04-04 10:00:46.000000000 +0300
208@@ -58,6 +58,7 @@
208@@ -58,6 +58,7 @@
209 , binary >= 0.5.1.0
209 , binary >= 0.5.1.0
210 , bytestring >= 0.9.2.1
210 , bytestring >= 0.9.2.1
@@ -213,3 +213,15 @@ diff -ru orig/gitlib-s3.cabal new/gitlib-s3.cabal
213 , data-default >= 0.5.1
213 , data-default >= 0.5.1
214 , directory >= 1.1.0.2
214 , directory >= 1.1.0.2
215 , filepath >= 1.3.0
215 , filepath >= 1.3.0
216+diff -ru orig/test/Smoke.hs new/test/Smoke.hs
217+--- orig/test/Smoke.hs 2014-04-04 10:00:47.080423588 +0300
218++++ new/test/Smoke.hs 2014-04-04 10:00:46.000000000 +0300
219+@@ -31,7 +31,7 @@
220+
221+ s3Factory
222+ :: (Failure Git.GitException m, MonadIO m, MonadBaseControl IO m,
223+- MonadUnsafeIO m, MonadThrow m)
224++ MonadThrow m)
225+ => Git.RepositoryFactory (ReaderT Lg.LgRepo (NoLoggingT m)) m Lg.LgRepo
226+ s3Factory = Lg.lgFactory
227+ { Git.runRepository = \ctxt m ->
patching/patches/process-conduit-1.1.0.0.patchnew file+21
@@ -0,0 +1,21 @@
1+diff -ru orig/process-conduit.cabal new/process-conduit.cabal
2+--- orig/process-conduit.cabal 2014-04-04 10:13:39.716407142 +0300
3++++ new/process-conduit.cabal 2014-04-04 10:13:39.000000000 +0300
4+@@ -48,4 +48,6 @@
5+ , bytestring
6+ , hspec >= 1.3
7+ , conduit
8++ , conduit-extra
9++ , resourcet
10+ , process-conduit
11+diff -ru orig/test.hs new/test.hs
12+--- orig/test.hs 2014-04-04 10:13:39.692407142 +0300
13++++ new/test.hs 2014-04-04 10:13:39.000000000 +0300
14+@@ -5,6 +5,7 @@
15+
16+ import qualified Data.ByteString.Lazy.Char8 as L
17+ import Data.Conduit
18++import Control.Monad.Trans.Resource (runResourceT)
19+ import qualified Data.Conduit.Binary as CB
20+ import Test.Hspec
21+