summaryrefslogtreecommitdiff
path: root/Test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-06-03 12:51:27 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-06-03 12:59:11 -0400
commit667ba46d7fd2f12141cfc49bd339d3861e87f4ed (patch)
treee262aeb35f6c13a1a5b55357f4f9ff7dc262f859 /Test.hs
parentc09628edea6da7dbf440db3ffe0b71662c82aeee (diff)
better failure diagnosis
Diffstat (limited to 'Test.hs')
-rw-r--r--Test.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Test.hs b/Test.hs
index 27cca4e66..0a9b6267a 100644
--- a/Test.hs
+++ b/Test.hs
@@ -969,9 +969,9 @@ test_union_merge_regression =
git_annex "get" [annexedfile] @? "get failed"
boolSystem "git" [Param "remote", Param "rm", Param "origin"] @? "remote rm"
forM_ [r3, r2, r1] $ \r -> indir r $
- git_annex "sync" [] @? "sync failed"
+ git_annex "sync" [] @? ("sync failed in " ++ r)
forM_ [r3, r2] $ \r -> indir r $
- git_annex "drop" ["--force", annexedfile] @? "drop failed"
+ git_annex "drop" ["--force", annexedfile] @? ("drop failed in " ++ r)
indir r1 $ do
git_annex "sync" [] @? "sync failed in r1"
git_annex_expectoutput "find" ["--in", "r3"] []