diff options
author | Joey Hess <joey@kitenet.net> | 2012-09-21 00:49:48 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-09-21 00:49:48 -0400 |
commit | 084aba8aaf43fed5d9c694c19ff1cd53e7b16bc8 (patch) | |
tree | 2f33fea02008cbbe6e63e76a8ff74520bce492bf /test.hs | |
parent | 240711d1aeada93172f98e1686593e4ac634450a (diff) |
fix breakage caught by test suite
Can't use show-ref --tags --branches, as that omits remote branches.
Instead, filter out the synced refs directly.
Diffstat (limited to 'test.hs')
-rw-r--r-- | test.hs | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -475,33 +475,33 @@ test_unused = "git-annex unused/dropunused" ~: intmpclonerepo $ do sha1annexedfilekey <- annexeval $ findkey sha1annexedfile git_annex "get" [annexedfile] @? "get of file failed" git_annex "get" [sha1annexedfile] @? "get of file failed" - checkunused [] + checkunused [] "after get" boolSystem "git" [Params "rm -q", File annexedfile] @? "git rm failed" - checkunused [] + checkunused [] "after rm" boolSystem "git" [Params "commit -q -m foo"] @? "git commit failed" - checkunused [] + checkunused [] "after commit" -- unused checks origin/master; once it's gone it is really unused boolSystem "git" [Params "remote rm origin"] @? "git remote rm origin failed" - checkunused [annexedfilekey] + checkunused [annexedfilekey] "after origin branches are gone" boolSystem "git" [Params "rm -q", File sha1annexedfile] @? "git rm failed" boolSystem "git" [Params "commit -q -m foo"] @? "git commit failed" - checkunused [annexedfilekey, sha1annexedfilekey] + checkunused [annexedfilekey, sha1annexedfilekey] "after rm sha1annexedfile" -- good opportunity to test dropkey also git_annex "dropkey" ["--force", Types.Key.key2file annexedfilekey] @? "dropkey failed" - checkunused [sha1annexedfilekey] + checkunused [sha1annexedfilekey] ("after dropkey --force " ++ Types.Key.key2file annexedfilekey) git_annex "dropunused" ["1", "2"] @? "dropunused failed" - checkunused [] + checkunused [] "after dropunused" git_annex "dropunused" ["10", "501"] @? "dropunused failed on bogus numbers" where - checkunused expectedkeys = do + checkunused expectedkeys desc = do git_annex "unused" [] @? "unused failed" unusedmap <- annexeval $ Logs.Unused.readUnusedLog "" let unusedkeys = M.elems unusedmap - assertEqual "unused keys differ" + assertEqual ("unused keys differ " ++ desc) (sort expectedkeys) (sort unusedkeys) findkey f = do r <- Backend.lookupFile f |