break module dependancy loop
A PITA but worth it to clean up the trust configuration code.
This commit is contained in:
parent
0d5c402210
commit
07cacbeee9
10 changed files with 109 additions and 107 deletions
3
test.hs
3
test.hs
|
@ -32,7 +32,6 @@ import qualified Locations
|
|||
import qualified Types.Backend
|
||||
import qualified Types
|
||||
import qualified GitAnnex
|
||||
import qualified Logs.Location
|
||||
import qualified Logs.UUIDBased
|
||||
import qualified Logs.Trust
|
||||
import qualified Logs.Remote
|
||||
|
@ -847,7 +846,7 @@ checklocationlog f expected = do
|
|||
r <- annexeval $ Backend.lookupFile f
|
||||
case r of
|
||||
Just (k, _) -> do
|
||||
uuids <- annexeval $ Logs.Location.keyLocations k
|
||||
uuids <- annexeval $ Remote.keyLocations k
|
||||
assertEqual ("bad content in location log for " ++ f ++ " key " ++ (show k) ++ " uuid " ++ show thisuuid)
|
||||
expected (thisuuid `elem` uuids)
|
||||
_ -> assertFailure $ f ++ " failed to look up key"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue