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

exception update in test too

Browse source
This commit is contained in:
Joey Hess 2012-02-03 16:57:07 -04:00
parent 5a82c0dee7
commit a84d50a1ed
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test.hs
View file

@ -11,10 +11,8 @@ import Test.QuickCheck
import System.Posix.Directory (changeWorkingDirectory) import System.Posix.Directory (changeWorkingDirectory)
import System.Posix.Files import System.Posix.Files
import Control.Exception (bracket_, bracket, throw)
import System.IO.Error
import System.Posix.Env import System.Posix.Env
import qualified Control.Exception.Extensible as E import Control.Exception.Extensible
import qualified Data.Map as M import qualified Data.Map as M
import System.IO.HVFS (SystemFS(..)) import System.IO.HVFS (SystemFS(..))
import Text.JSON import Text.JSON
@ -695,7 +693,7 @@ test_crypto = "git-annex crypto" ~: intmpclonerepo $ when Build.SysConfig.gpg $
git_annex :: String -> [String] -> IO Bool git_annex :: String -> [String] -> IO Bool
git_annex command params = do git_annex command params = do
-- catch all errors, including normally fatal errors -- catch all errors, including normally fatal errors
r <- E.try (run)::IO (Either E.SomeException ()) r <- try (run)::IO (Either SomeException ())
case r of case r of
Right _ -> return True Right _ -> return True
Left _ -> return False Left _ -> return False
@ -761,7 +759,7 @@ indir dir a = do
-- any type of error and change back to cwd before -- any type of error and change back to cwd before
-- rethrowing. -- rethrowing.
r <- bracket_ (changeToTmpDir dir) (changeWorkingDirectory cwd) r <- bracket_ (changeToTmpDir dir) (changeWorkingDirectory cwd)
(E.try (a)::IO (Either E.SomeException ())) (try (a)::IO (Either SomeException ()))
case r of case r of
Right () -> return () Right () -> return ()
Left e -> throw e Left e -> throw e
@ -832,14 +830,14 @@ checkunwritable f = do
checkwritable :: FilePath -> Assertion checkwritable :: FilePath -> Assertion
checkwritable f = do checkwritable f = do
r <- try $ writeFile f $ content f r <- tryIO $ writeFile f $ content f
case r of case r of
Left _ -> assertFailure $ "unable to modify " ++ f Left _ -> assertFailure $ "unable to modify " ++ f
Right _ -> return () Right _ -> return ()
checkdangling :: FilePath -> Assertion checkdangling :: FilePath -> Assertion
checkdangling f = do checkdangling f = do
r <- try $ readFile f r <- tryIO $ readFile f
case r of case r of
Left _ -> return () -- expected; dangling link Left _ -> return () -- expected; dangling link
Right _ -> assertFailure $ f ++ " was not a dangling link as expected" Right _ -> assertFailure $ f ++ " was not a dangling link as expected"