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

test suite 100% pass in v6, finally!

Browse source 
Set annex.largefiles when adding the conflicting non-annexed file,
otherwise it would be added as an annexed file.
This commit is contained in:
Joey Hess 2015-12-30 15:12:27 -04:00
parent 829ae91009
commit 0b8bba8031
Failed to extract signature
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Test.hs
View file

@ -123,8 +123,8 @@ tests = testGroup "Tests" $ properties :
map (\(d, te) -> withTestMode te (unitTests d)) testmodes map (\(d, te) -> withTestMode te (unitTests d)) testmodes
where where
testmodes = testmodes =
-- [ ("v6", TestMode { forceDirect = False, annexVersion = "6" }) [ ("v6", TestMode { forceDirect = False, annexVersion = "6" })
[ ("v5", TestMode { forceDirect = False, annexVersion = "5" }) , ("v5", TestMode { forceDirect = False, annexVersion = "5" })
-- Windows will only use direct mode, so don't test twice. -- Windows will only use direct mode, so don't test twice.
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
, ("v5 direct", TestMode { forceDirect = True, annexVersion = "5" }) , ("v5 direct", TestMode { forceDirect = True, annexVersion = "5" })
@ -1097,6 +1097,11 @@ test_nonannexed_file_conflict_resolution = do
indir r2 $ do indir r2 $ do
disconnectOrigin disconnectOrigin
writeFile conflictor nonannexed_content writeFile conflictor nonannexed_content
boolSystem "git"
[ Param "config"
, Param "annex.largefiles"
, Param ("exclude=" ++ ingitfile ++ " and exclude=" ++ conflictor)
] @? "git config annex.largefiles failed"
boolSystem "git" [Param "add", File conflictor] @? "git add conflictor failed" boolSystem "git" [Param "add", File conflictor] @? "git add conflictor failed"
git_annex "sync" [] @? "sync failed in r2" git_annex "sync" [] @? "sync failed in r2"
pair r1 r2 pair r1 r2

8
doc/todo/smudge.mdwn
View file

@ -3,11 +3,9 @@ git-annex should use smudge/clean filters.
### implementation todo list ### implementation todo list
* Test suite: * Test suite:
Next "needs to be done" is to work on the test suite some more for v6 - add a test for how it resolves a conflict between
repositories. Need to add a test for how it resolves a conflict between an unlocked and a locked file that point to the same key.
an unlocked and a locked file that point to the same key. Need to add - add another pass through all the tests with files being unlocked in v6 mode
another pass through all the tests with files being unlocked. And need to
fix the two remaining test failures.
* Reconcile staged changes into the associated files database, whenever * Reconcile staged changes into the associated files database, whenever
the database is queried. This is needed to handle eg: the database is queried. This is needed to handle eg:
git add largefile git add largefile