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

Make test suite not rely on a working cp -pr.

Browse source 
(The Unix wars are still ON!)
This commit is contained in:
Joey Hess 2011-02-13 14:17:02 -04:00
parent 820b01c253
commit 3390183400
3 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -3,6 +3,8 @@ git-annex (0.22) UNRELEASED; urgency=low
* Fix test suite to reap zombies.
(Zombies can be particularly annoying on OSX; thanks to Jimmy Tang
for his help eliminating the infestation... for now.)
* Make test suite not rely on a working cp -pr.
(The Unix wars are still ON!)
-- Joey Hess <joeyh@debian.org> Sun, 13 Feb 2011 00:48:02 -0400

6
doc/bugs/Problems_running_make_on_osx.mdwn
View file

@ -41,3 +41,9 @@ My knowledge of Haskell (had to lookup the spelling...) is more than rudimentary
> entire end of the file from line 68, "for quickcheck" down. This code
> is only used by the test suite (so "make test" will fail),
> but it should get it to build. --[[Joey]]
---
Closing this bug because the above problem now has a solution documented on
the install page, and the below test suite failure problems should all be
resolved on OSX. [[done]] --[[Joey]]

31
test.hs
View file

@ -137,7 +137,10 @@ test_unannex = "git-annex unannex" ~: TestList [nocopy, withcopy]
annexed_notpresent annexedfile
git_annex "unannex" ["-q", annexedfile] @? "unannex failed with no copy"
annexed_notpresent annexedfile
withcopy = "with content" ~: intmpcopyrepo $ do
withcopy = "with content" ~: intmpclonerepo $ do
git_annex "get" ["-q", annexedfile] @? "get failed"
Utility.boolSystem "git" ["commit", "-q", "-a", "-m", "state changed"]
@? "git commit of state failed"
annexed_present annexedfile
git_annex "unannex" ["-q", annexedfile, sha1annexedfile] @? "unannex failed"
unannexed annexedfile
@ -149,7 +152,12 @@ test_unannex = "git-annex unannex" ~: TestList [nocopy, withcopy]
test_drop :: Test
test_drop = "git-annex drop" ~: TestList [noremote, withremote, untrustedremote]
where
noremote = "no remotes" ~: TestCase $ intmpcopyrepo $ do
noremote = "no remotes" ~: TestCase $ intmpclonerepo $ do
git_annex "get" ["-q", annexedfile] @? "get failed"
Utility.boolSystem "git" ["commit", "-q", "-a", "-m", "state changed"]
@? "git commit of state failed"
Utility.boolSystem "git" ["remote", "rm", "origin"]
@? "git remote rm origin failed"
r <- git_annex "drop" ["-q", annexedfile]
not r @? "drop wrongly succeeded with no known copy of file"
annexed_present annexedfile
@ -347,11 +355,13 @@ test_fsck = "git-annex fsck" ~: TestList [basicfsck, withlocaluntrusted, withrem
Utility.boolSystem "git" ["config", "annex.numcopies", "1"] @? "git config failed"
corrupt annexedfile
corrupt sha1annexedfile
withlocaluntrusted = TestCase $ intmpcopyrepo $ do
withlocaluntrusted = TestCase $ intmpclonerepo $ do
git_annex "get" ["-q", annexedfile] @? "get failed"
git_annex "untrust" ["-q", "origin"] @? "untrust of origin repo failed"
git_annex "untrust" ["-q", "."] @? "untrust of current repo failed"
fsck_should_fail "content only available in untrusted (current) repository"
git_annex "trust" ["-q", "."] @? "trust of current repo failed"
git_annex "fsck" ["-q"] @? "fsck failed on trusted repo"
git_annex "fsck" ["-q", annexedfile] @? "fsck failed on file present in trusted repo"
withremoteuntrusted = TestCase $ intmpclonerepo $ do
Utility.boolSystem "git" ["config", "annex.numcopies", "2"] @? "git config failed"
git_annex "get" ["-q", annexedfile] @? "get failed"
@ -475,15 +485,9 @@ innewrepo a = withgitrepo $ \r -> indir r a
inmainrepo :: Assertion -> Assertion
inmainrepo a = indir mainrepodir a
intmpcopyrepo :: Assertion -> Assertion
intmpcopyrepo a = withtmpcopyrepo $ \r -> indir r a
intmpclonerepo :: Assertion -> Assertion
intmpclonerepo a = withtmpclonerepo $ \r -> indir r a
withtmpcopyrepo :: (FilePath -> Assertion) -> Assertion
withtmpcopyrepo = bracket (copyrepo mainrepodir tmprepodir) cleanup
withtmpclonerepo :: (FilePath -> Assertion) -> Assertion
withtmpclonerepo = bracket (clonerepo mainrepodir tmprepodir) cleanup
@ -513,13 +517,6 @@ setuprepo dir = do
Utility.boolSystem "git" ["config", "user.email", "test@example.com"] @? "git config failed"
return dir
copyrepo :: FilePath -> FilePath -> IO FilePath
copyrepo old new = do
cleanup new
ensuretmpdir
Utility.boolSystem "cp" ["-pr", old, new] @? "cp -pr failed"
return new
-- clones are always done as local clones; we cannot test ssh clones
clonerepo :: FilePath -> FilePath -> IO FilePath
clonerepo old new = do