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

Fix test suite to not require a unicode locale.

Browse source 
Without a unicode locale, it will fail to print a unicode filename to
console, and fails.
This commit is contained in:
Joey Hess 2012-02-29 02:32:05 -04:00
parent f53f23c3f3
commit e5fee3f352
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
git-annex (3.20120229) unstable; urgency=low
* Fix test suite to not require a unicode locale.
-- Joey Hess <joeyh@debian.org> Wed, 29 Feb 2012 02:31:31 -0400
git-annex (3.20120227) unstable; urgency=low git-annex (3.20120227) unstable; urgency=low
* Modifications to support ghc 7.4's handling of filenames. * Modifications to support ghc 7.4's handling of filenames.

10
test.hs
View file

@ -131,7 +131,7 @@ test_init = "git-annex init" ~: TestCase $ innewrepo $ do
reponame = "test repo" reponame = "test repo"
test_add :: Test test_add :: Test
test_add = "git-annex add" ~: TestList [basic, sha1dup, sha1unicode, subdirs] test_add = "git-annex add" ~: TestList [basic, sha1dup, subdirs]
where where
-- this test case runs in the main repo, to set up a basic -- this test case runs in the main repo, to set up a basic
-- annexed file that later tests will use -- annexed file that later tests will use
@ -158,10 +158,6 @@ test_add = "git-annex add" ~: TestList [basic, sha1dup, sha1unicode, subdirs]
git_annex "add" [sha1annexedfiledup, "--backend=SHA1"] @? "add of second file with same SHA1 failed" git_annex "add" [sha1annexedfiledup, "--backend=SHA1"] @? "add of second file with same SHA1 failed"
annexed_present sha1annexedfiledup annexed_present sha1annexedfiledup
annexed_present sha1annexedfile annexed_present sha1annexedfile
sha1unicode = TestCase $ intmpclonerepo $ do
writeFile sha1annexedfileunicode $ content sha1annexedfileunicode
git_annex "add" [sha1annexedfileunicode, "--backend=SHA1"] @? "add of unicode filename failed"
annexed_present sha1annexedfileunicode
subdirs = TestCase $ intmpclonerepo $ do subdirs = TestCase $ intmpclonerepo $ do
createDirectory "dir" createDirectory "dir"
writeFile "dir/foo" $ content annexedfile writeFile "dir/foo" $ content annexedfile
@ -923,9 +919,6 @@ sha1annexedfile = "sha1foo"
sha1annexedfiledup :: String sha1annexedfiledup :: String
sha1annexedfiledup = "sha1foodup" sha1annexedfiledup = "sha1foodup"
sha1annexedfileunicode :: String
sha1annexedfileunicode = "foo¡"
ingitfile :: String ingitfile :: String
ingitfile = "bar" ingitfile = "bar"
@ -935,7 +928,6 @@ content f
| f == ingitfile = "normal file content" | f == ingitfile = "normal file content"
| f == sha1annexedfile ="sha1 annexed file content" | f == sha1annexedfile ="sha1 annexed file content"
| f == sha1annexedfiledup = content sha1annexedfile | f == sha1annexedfiledup = content sha1annexedfile
| f == sha1annexedfileunicode ="sha1 annexed file content ¡ünicodé!"
| f == wormannexedfile = "worm annexed file content" | f == wormannexedfile = "worm annexed file content"
| otherwise = "unknown file " ++ f | otherwise = "unknown file " ++ f