fix strange test failure
It was trying to git annex adjust when in a direct mode repo, and that of course fails. What I don't understand though, is how the test suite managed to work before, when it was clearly checking the wrong thing. Since the right way to fix it was obvious, I have not bisected. This work is supported by the NIH-funded NICEMAN (ReproNim TR&D3) project.
This commit is contained in:
parent
63cf3381f0
commit
94aa0e2f64
3 changed files with 13 additions and 8 deletions
6
Test.hs
6
Test.hs
|
@ -1098,7 +1098,7 @@ test_conflict_resolution =
|
|||
|
||||
{- Conflict resolution while in an adjusted branch. -}
|
||||
test_conflict_resolution_adjusted_branch :: Assertion
|
||||
test_conflict_resolution_adjusted_branch = whenM Annex.AdjustedBranch.isGitVersionSupported $
|
||||
test_conflict_resolution_adjusted_branch = whenM (annexeval Annex.AdjustedBranch.isSupported) $
|
||||
withtmpclonerepo $ \r1 ->
|
||||
withtmpclonerepo $ \r2 -> do
|
||||
indir r1 $ do
|
||||
|
@ -1447,7 +1447,7 @@ test_mixed_lock_conflict_resolution =
|
|||
- where the same file is added to both independently. The bad merge
|
||||
- emptied the whole tree. -}
|
||||
test_adjusted_branch_merge_regression :: Assertion
|
||||
test_adjusted_branch_merge_regression = whenM Annex.AdjustedBranch.isGitVersionSupported $
|
||||
test_adjusted_branch_merge_regression = whenM (annexeval Annex.AdjustedBranch.isSupported) $
|
||||
withtmpclonerepo $ \r1 ->
|
||||
withtmpclonerepo $ \r2 -> do
|
||||
pair r1 r2
|
||||
|
@ -1474,7 +1474,7 @@ test_adjusted_branch_merge_regression = whenM Annex.AdjustedBranch.isGitVersionS
|
|||
- a subtree to an existing tree lost files. -}
|
||||
test_adjusted_branch_subtree_regression :: Assertion
|
||||
test_adjusted_branch_subtree_regression =
|
||||
whenM Annex.AdjustedBranch.isGitVersionSupported $
|
||||
whenM (annexeval Annex.AdjustedBranch.isSupported) $
|
||||
withtmpclonerepo $ \r -> do
|
||||
indir r $ do
|
||||
disconnectOrigin
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue