From 4dafa9471ee4d9c53d4348244ed81869efe30923 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 4 Apr 2014 10:14:23 +0300
Subject: [PATCH] Some test fixes

---
 Stackage/Config.hs                            |  2 ++
 patching/patches/gitlib-s3-3.0.1.patch        | 20 ++++++++++++++----
 .../patches/process-conduit-1.1.0.0.patch     | 21 +++++++++++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 patching/patches/process-conduit-1.1.0.0.patch

diff --git a/Stackage/Config.hs b/Stackage/Config.hs
index 5facc7a9..9437b03d 100644
--- a/Stackage/Config.hs
+++ b/Stackage/Config.hs
@@ -134,6 +134,8 @@ defaultExpectedFailures ghcVer = execWriter $ do
         , "profunctor-extras semigroupoid-extras"
         , "conduit-extra hamlet shakespeare-css shakespeare-i18n"
         , "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
diff --git a/patching/patches/gitlib-s3-3.0.1.patch b/patching/patches/gitlib-s3-3.0.1.patch
index 2a931952..1b1c09a7 100644
--- a/patching/patches/gitlib-s3-3.0.1.patch
+++ b/patching/patches/gitlib-s3-3.0.1.patch
@@ -1,6 +1,6 @@
 diff -ru orig/Git/S3.hs new/Git/S3.hs
---- orig/Git/S3.hs	2014-04-04 06:49:18.680668125 +0300
-+++ new/Git/S3.hs	2014-04-04 06:49:18.000000000 +0300
+--- orig/Git/S3.hs	2014-04-04 10:00:47.080423588 +0300
++++ new/Git/S3.hs	2014-04-04 10:00:46.000000000 +0300
 @@ -467,7 +467,10 @@
           -> ResourceT m (Response (ResponseMetadata a) a)
  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
  s3FactoryLogger bucket accessKey secretKey dir callbacks = lgFactoryLogger
 diff -ru orig/gitlib-s3.cabal new/gitlib-s3.cabal
---- orig/gitlib-s3.cabal	2014-04-04 06:49:18.680668125 +0300
-+++ new/gitlib-s3.cabal	2014-04-04 06:49:18.000000000 +0300
+--- orig/gitlib-s3.cabal	2014-04-04 10:00:47.084423588 +0300
++++ new/gitlib-s3.cabal	2014-04-04 10:00:46.000000000 +0300
 @@ -58,6 +58,7 @@
      , binary               >= 0.5.1.0
      , bytestring           >= 0.9.2.1
@@ -213,3 +213,15 @@ diff -ru orig/gitlib-s3.cabal new/gitlib-s3.cabal
      , data-default         >= 0.5.1
      , directory            >= 1.1.0.2
      , 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 ->
diff --git a/patching/patches/process-conduit-1.1.0.0.patch b/patching/patches/process-conduit-1.1.0.0.patch
new file mode 100644
index 00000000..d3973788
--- /dev/null
+++ b/patching/patches/process-conduit-1.1.0.0.patch
@@ -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
+