summaryrefslogtreecommitdiff
path: root/test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-02-29 02:32:05 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-02-29 02:32:05 -0400
commite5fee3f35257d4a27e573398c114fa58f511da9d (patch)
tree405b99340c4be1d9315c89a6761313e3787ca6a1 /test.hs
parentf53f23c3f3fd1a5b4966d4f22b0026218bf3ae25 (diff)
Fix test suite to not require a unicode locale.
Without a unicode locale, it will fail to print a unicode filename to console, and fails.
Diffstat (limited to 'test.hs')
-rw-r--r--test.hs10
1 files changed, 1 insertions, 9 deletions
diff --git a/test.hs b/test.hs
index 69837f9ed..bbb8001d6 100644
--- a/test.hs
+++ b/test.hs
@@ -131,7 +131,7 @@ test_init = "git-annex init" ~: TestCase $ innewrepo $ do
reponame = "test repo"
test_add :: Test
-test_add = "git-annex add" ~: TestList [basic, sha1dup, sha1unicode, subdirs]
+test_add = "git-annex add" ~: TestList [basic, sha1dup, subdirs]
where
-- this test case runs in the main repo, to set up a basic
-- 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"
annexed_present sha1annexedfiledup
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
createDirectory "dir"
writeFile "dir/foo" $ content annexedfile
@@ -923,9 +919,6 @@ sha1annexedfile = "sha1foo"
sha1annexedfiledup :: String
sha1annexedfiledup = "sha1foodup"
-sha1annexedfileunicode :: String
-sha1annexedfileunicode = "foo¡"
-
ingitfile :: String
ingitfile = "bar"
@@ -935,7 +928,6 @@ content f
| f == ingitfile = "normal file content"
| f == sha1annexedfile ="sha1 annexed file content"
| f == sha1annexedfiledup = content sha1annexedfile
- | f == sha1annexedfileunicode ="sha1 annexed file content ¡ünicodé!"
| f == wormannexedfile = "worm annexed file content"
| otherwise = "unknown file " ++ f