summaryrefslogtreecommitdiff
path: root/Test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-15 15:34:28 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-15 15:34:28 -0400
commit59654d08a2335bf716f38b76095121c6e4c62535 (patch)
treef4d450caa09cfc4e373ee946b2cef956f9429757 /Test.hs
parent271fe1ce457447b0aee8d825b9186a0b579b56d0 (diff)
reorg
Diffstat (limited to 'Test.hs')
-rw-r--r--Test.hs9
1 files changed, 5 insertions, 4 deletions
diff --git a/Test.hs b/Test.hs
index f4035f605..1a0601b35 100644
--- a/Test.hs
+++ b/Test.hs
@@ -65,6 +65,7 @@ import qualified Types.Messages
import qualified Config
import qualified Config.Cost
import qualified Crypto
+import qualified Annex.WorkTree
import qualified Annex.Init
import qualified Annex.CatFile
import qualified Annex.View
@@ -810,7 +811,7 @@ test_unused = intmpclonerepoInDirect $ do
assertEqual ("unused keys differ " ++ desc)
(sort expectedkeys) (sort unusedkeys)
findkey f = do
- r <- Backend.lookupFile f
+ r <- Annex.WorkTree.lookupFile f
return $ fromJust r
test_describe :: Assertion
@@ -1380,7 +1381,7 @@ test_crypto = do
(c,k) <- annexeval $ do
uuid <- Remote.nameToUUID "foo"
rs <- Logs.Remote.readRemoteLog
- Just k <- Backend.lookupFile annexedfile
+ Just k <- Annex.WorkTree.lookupFile annexedfile
return (fromJust $ M.lookup uuid rs, k)
let key = if scheme `elem` ["hybrid","pubkey"]
then Just $ Utility.Gpg.KeyIds [Utility.Gpg.testKeyId]
@@ -1684,7 +1685,7 @@ checkdangling f = ifM (annexeval Config.crippledFileSystem)
checklocationlog :: FilePath -> Bool -> Assertion
checklocationlog f expected = do
thisuuid <- annexeval Annex.UUID.getUUID
- r <- annexeval $ Backend.lookupFile f
+ r <- annexeval $ Annex.WorkTree.lookupFile f
case r of
Just k -> do
uuids <- annexeval $ Remote.keyLocations k
@@ -1695,7 +1696,7 @@ checklocationlog f expected = do
checkbackend :: FilePath -> Types.Backend -> Assertion
checkbackend file expected = do
b <- annexeval $ maybe (return Nothing) (Backend.getBackend file)
- =<< Backend.lookupFile file
+ =<< Annex.WorkTree.lookupFile file
assertEqual ("backend for " ++ file) (Just expected) b
inlocationlog :: FilePath -> Assertion