summaryrefslogtreecommitdiff
path: root/Test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-02-03 12:23:05 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-02-03 12:23:05 -0400
commitb02e638bf48470495279cfb52ec8d035a5e6b60e (patch)
tree425a97e8712cc1adb6c711f53fc9f782699a55cf /Test.hs
parentf5d0c8f0bf7f018479eb4da7e8c41598b7aacb7d (diff)
improve failure message
Diffstat (limited to 'Test.hs')
-rw-r--r--Test.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Test.hs b/Test.hs
index 581b36859..4b590a1ce 100644
--- a/Test.hs
+++ b/Test.hs
@@ -837,9 +837,9 @@ test_mixed_conflict_resolution env = do
variantprefix = conflictor ++ ".variant"
checkmerge d = do
doesDirectoryExist (d </> conflictor) @? (d ++ " conflictor directory missing")
- (any (variantprefix `isPrefixOf`)
- <$> getDirectoryContents d)
- @? (d ++ "conflictor file missing")
+ l <- getDirectoryContents d
+ any (variantprefix `isPrefixOf`) l
+ @? (d ++ " conflictor file missing in: " ++ show l )
{- Set up repos as remotes of each other. -}
pair :: TestEnv -> FilePath -> FilePath -> Assertion