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

convert removeExportDirectory to throw exception

Browse source 
Part of ongoing transition to make remote methods
throw exceptions, rather than silently hide them.

This commit was sponsored by Ilya Shlyakhter on Patreon.
This commit is contained in:
Joey Hess 2020-05-15 14:32:45 -04:00
parent 0a9a3ed1c3
commit 037440ef36
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 38 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Command/TestRemote.hs
View file

@ -307,9 +307,9 @@ testExportTree runannex mkr mkk1 mkk2 =
, check "retrieve export fails after removal" $ \ea _k1 k2 ->
not <$> retrieveexport ea k2
, check "remove export directory" $ \ea _k1 _k2 ->
removeexportdirectory ea
isRight <$> tryNonAsync (removeexportdirectory ea)
, check "remove export directory that is already removed" $ \ea _k1 _k2 ->
removeexportdirectory ea
isRight <$> tryNonAsync (removeexportdirectory ea)
-- renames are not tested because remotes do not need to support them
]
where
@ -335,8 +335,8 @@ testExportTree runannex mkr mkk1 mkk2 =
checkpresentexport ea k = Remote.checkPresentExport ea k testexportlocation
removeexport ea k = Remote.removeExport ea k testexportlocation
removeexportdirectory ea = case Remote.removeExportDirectory ea of
Nothing -> return True
Just a -> a (mkExportDirectory (toRawFilePath testexportdirectory))
Nothing -> noop
testUnavailable :: RunAnnex -> Annex (Maybe Remote) -> Annex Key -> [TestTree]
testUnavailable runannex mkr mkk =