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

set annex.largefiles earlier in test suite

Browse source 
The ingitfile was having git run it through the clean filter in some cases.
This commit is contained in:
Joey Hess 2015-12-30 13:29:00 -04:00
parent 0475411f2f
commit 6c1cf8267d
Failed to extract signature
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Test.hs
View file

@ -770,6 +770,7 @@ test_migrate' usegitattributes = intmpclonerepoInDirect $ do
test_unused :: Assertion test_unused :: Assertion
-- This test is broken in direct mode -- This test is broken in direct mode
test_unused = intmpclonerepoInDirect $ do test_unused = intmpclonerepoInDirect $ do
checkunused [] "in new clone"
-- keys have to be looked up before files are removed -- keys have to be looked up before files are removed
annexedfilekey <- annexeval $ findkey annexedfile annexedfilekey <- annexeval $ findkey annexedfile
sha1annexedfilekey <- annexeval $ findkey sha1annexedfile sha1annexedfilekey <- annexeval $ findkey sha1annexedfile
@ -1629,6 +1630,12 @@ configrepo dir = indir dir $ do
boolSystem "git" [Param "config", Param "user.email", Param "test@example.com"] @? "git config failed" boolSystem "git" [Param "config", Param "user.email", Param "test@example.com"] @? "git config failed"
-- avoid signed commits by test suite -- avoid signed commits by test suite
boolSystem "git" [Param "config", Param "commit.gpgsign", Param "false"] @? "git config failed" boolSystem "git" [Param "config", Param "commit.gpgsign", Param "false"] @? "git config failed"
-- tell git-annex to not annex the ingitfile
boolSystem "git"
[ Param "config"
, Param "annex.largefiles"
, Param ("exclude=" ++ ingitfile)
] @? "git config annex.largefiles failed"
ensuretmpdir :: IO () ensuretmpdir :: IO ()
ensuretmpdir = do ensuretmpdir = do
@ -1797,12 +1804,6 @@ setupTestMode = do
testmode <- getTestMode testmode <- getTestMode
when (forceDirect testmode) $ when (forceDirect testmode) $
git_annex "direct" ["-q"] @? "git annex direct failed" git_annex "direct" ["-q"] @? "git annex direct failed"
whenM (annexeval Annex.Version.versionSupportsUnlockedPointers) $
boolSystem "git"
[ Param "config"
, Param "annex.largefiles"
, Param ("exclude=" ++ ingitfile)
] @? "git config annex.largefiles failed"
changeToTmpDir :: FilePath -> IO () changeToTmpDir :: FilePath -> IO ()
changeToTmpDir t = do changeToTmpDir t = do