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

fix test case to convert slashes for DOS

Browse source
This commit is contained in:
Joey Hess 2014-03-04 15:06:40 -04:00
parent 8496d8aa63
commit c1c4f0cdf6
Failed to extract signature
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Test.hs
View file

@ -35,6 +35,7 @@ import qualified Git.Filename
import qualified Git.Types import qualified Git.Types
import qualified Git.Ref import qualified Git.Ref
import qualified Git.LsTree import qualified Git.LsTree
import qualified Git.FilePath
import qualified Locations import qualified Locations
import qualified Types.KeySource import qualified Types.KeySource
import qualified Types.Backend import qualified Types.Backend
@ -849,7 +850,7 @@ test_mixed_conflict_resolution env = do
-- it's possible to lose track. -- it's possible to lose track.
indir env d $ do indir env d $ do
git_annex env "get" (conflictor:v) @? ("get failed in " ++ what) git_annex env "get" (conflictor:v) @? ("get failed in " ++ what)
git_annex_expectoutput env "find" [conflictor] [subfile] git_annex_expectoutput env "find" [conflictor] [Git.FilePath.toInternalGitPath subfile]
git_annex_expectoutput env "find" v v git_annex_expectoutput env "find" v v
{- Check merge conflict resolution when there is a local file, {- Check merge conflict resolution when there is a local file,
@ -926,7 +927,7 @@ test_conflict_resolution_symlinks env = do
where where
conflictor = "conflictor" conflictor = "conflictor"
check_is_link f what = do check_is_link f what = do
git_annex_expectoutput env "find" ["--include=*", f] [f] git_annex_expectoutput env "find" ["--include=*", f] [Git.FilePath.toInternalGitPath f]
l <- annexeval $ Annex.inRepo $ Git.LsTree.lsTreeFiles Git.Ref.headRef [f] l <- annexeval $ Annex.inRepo $ Git.LsTree.lsTreeFiles Git.Ref.headRef [f]
all (\i -> Git.Types.toBlobType (Git.LsTree.mode i) == Just Git.Types.SymlinkBlob) l all (\i -> Git.Types.toBlobType (Git.LsTree.mode i) == Just Git.Types.SymlinkBlob) l
@? (what ++ " " ++ f ++ " lost symlink bit after merge: " ++ show l) @? (what ++ " " ++ f ++ " lost symlink bit after merge: " ++ show l)