diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-08-12 10:36:51 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-08-12 10:36:51 -0400 |
| commit | 7f9940c1f4a6a533c1d5e7cd7980419f59524ff3 (patch) | |
| tree | 3e05d15a1a0544f19713d99a4d513febe8c3c8d7 /Utility/Base64.hs | |
| parent | e588f9e1597aadfaf881b9a4b15007bd41479eed (diff) | |
fix test suite fail in LANG=C
This was caused by 88aeb849f620a13da47508045daae461a223c997
an Arbitrary String is not necessarily encoded using the filesystem
encoding, and in a non-utf8 locale, encodeBS throws an exception on such a
string. All I could think to do is limit test data to ascii.
This shouldn't be a problem in practice, because the all Strings in
git-annex that are not generated by Arbitrary should be loaded in a way
that does apply the filesystem encoding.
Diffstat (limited to 'Utility/Base64.hs')
| -rw-r--r-- | Utility/Base64.hs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Utility/Base64.hs b/Utility/Base64.hs index 0e3087276..8b43ecfab 100644 --- a/Utility/Base64.hs +++ b/Utility/Base64.hs @@ -10,11 +10,13 @@ module Utility.Base64 (toB64, fromB64Maybe, fromB64, prop_b64_roundtrips) where +import Utility.FileSystemEncoding + import qualified "sandi" Codec.Binary.Base64 as B64 import Data.Maybe import qualified Data.ByteString.Lazy as L import Data.ByteString.UTF8 (fromString, toString) -import Utility.FileSystemEncoding +import Data.Char toB64 :: String -> String toB64 = toString . B64.encode . L.toStrict . encodeBS @@ -28,5 +30,9 @@ fromB64 = fromMaybe bad . fromB64Maybe where bad = error "bad base64 encoded data" +-- Only ascii strings are tested, because an arbitrary string may contain +-- characters not encoded using the FileSystemEncoding. prop_b64_roundtrips :: String -> Bool -prop_b64_roundtrips s = s == fromB64 (toB64 s) +prop_b64_roundtrips s + | all (isAscii) s = s == fromB64 (toB64 s) + | otherwise = True |