mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

improve failure message

Browse source
This commit is contained in:
Joey Hess 2014-02-03 12:23:05 -04:00
parent 1c997fd08c
commit ec417b108d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Test.hs
View file

@ -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