summaryrefslogtreecommitdiff
path: root/test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-04-30 13:59:05 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-04-30 13:59:05 -0400
commitbf70bbdbfc875836cf880ba8a03cac74948a30a3 (patch)
tree1f422e9cbf29e3541787abb9522f9ecd561f65ce /test.hs
parent0c9c14b52fcdd9684da70c8dd763661acdbd3843 (diff)
fix test suite build
Diffstat (limited to 'test.hs')
-rw-r--r--test.hs9
1 files changed, 5 insertions, 4 deletions
diff --git a/test.hs b/test.hs
index 5f4b0ad40..8c24c3a23 100644
--- a/test.hs
+++ b/test.hs
@@ -38,6 +38,7 @@ import qualified Logs.Remote
import qualified Remote
import qualified Command.DropUnused
import qualified Types.Key
+import qualified Types.Messages
import qualified Config
import qualified Crypto
import qualified Utility.Path
@@ -720,10 +721,10 @@ git_annex_expectoutput command params expected = do
-- are not run; this should only be used for actions that query state.
annexeval :: Types.Annex a -> IO a
annexeval a = do
- g <- Git.Construct.fromCurrent
- g' <- Git.Config.read g
- s <- Annex.new g'
- Annex.eval s { Annex.output = Annex.QuietOutput } a
+ s <- Annex.new =<< Git.Config.read =<< Git.Construct.fromCurrent
+ Annex.eval s $ do
+ Annex.setOutput Types.Messages.QuietOutput
+ a
innewrepo :: Assertion -> Assertion
innewrepo a = withgitrepo $ \r -> indir r a