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

more fixes for test suite in direct mode

Browse source 
Still quite a few failures.
This commit is contained in:
Joey Hess 2013-05-15 19:33:27 -04:00
parent aba49995b6
commit ecca55ae85
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Test.hs
View file

@ -188,7 +188,7 @@ test_add env = "git-annex add" ~: TestList [basic, sha1dup, subdirs]
boolSystem "git" [Params "rm --force -q", File wormannexedfile] @? "git rm failed" boolSystem "git" [Params "rm --force -q", File wormannexedfile] @? "git rm failed"
writeFile ingitfile $ content ingitfile writeFile ingitfile $ content ingitfile
boolSystem "git" [Param "add", File ingitfile] @? "git add failed" boolSystem "git" [Param "add", File ingitfile] @? "git add failed"
boolSystem "git" [Params "commit -q -a -m commit"] @? "git commit failed" boolSystem "git" [Params "commit -q -m commit"] @? "git commit failed"
git_annex env "add" [ingitfile] @? "add ingitfile should be no-op" git_annex env "add" [ingitfile] @? "add ingitfile should be no-op"
unannexed ingitfile unannexed ingitfile
sha1dup = TestCase $ intmpclonerepo env $ do sha1dup = TestCase $ intmpclonerepo env $ do
@ -373,7 +373,7 @@ test_edit env = "git-annex edit/commit" ~: TestList [t False, t True]
git_annex env "pre-commit" [] git_annex env "pre-commit" []
@? "pre-commit failed" @? "pre-commit failed"
else do else do
boolSystem "git" [Params "commit -q -a -m contentchanged"] boolSystem "git" [Params "commit -q -m contentchanged"]
@? "git commit of edited file failed" @? "git commit of edited file failed"
runchecks [checklink, checkunwritable] annexedfile runchecks [checklink, checkunwritable] annexedfile
c <- readFile annexedfile c <- readFile annexedfile
@ -906,11 +906,14 @@ checkwritable f = do
Right _ -> return () Right _ -> return ()
checkdangling :: FilePath -> Assertion checkdangling :: FilePath -> Assertion
checkdangling f = do checkdangling f = ifM (annexeval Config.crippledFileSystem)
r <- tryIO $ readFile f ( return () -- probably no real symlinks to test
case r of , do
Left _ -> return () -- expected; dangling link r <- tryIO $ readFile f
Right _ -> assertFailure $ f ++ " was not a dangling link as expected" case r of
Left _ -> return () -- expected; dangling link
Right _ -> assertFailure $ f ++ " was not a dangling link as expected"
)
checklocationlog :: FilePath -> Bool -> Assertion checklocationlog :: FilePath -> Bool -> Assertion
checklocationlog f expected = do checklocationlog f expected = do

3
doc/design/assistant/android.mdwn
View file

@ -25,8 +25,7 @@ to improve it.
and a few places use it. I have some horrible workarounds in place. and a few places use it. I have some horrible workarounds in place.
* Get local pairing to work. network-multicast and network-info don't * Get local pairing to work. network-multicast and network-info don't
currently install. currently install.
* Get test suite to pass. Current failure is because `git fetch` is somehow * Get test suite to pass.
broken with local repositories.
* Make app autostart on boot, optionally. <http://stackoverflow.com/questions/1056570/how-to-autostart-an-android-application> * Make app autostart on boot, optionally. <http://stackoverflow.com/questions/1056570/how-to-autostart-an-android-application>
* The app should be aware of power status, and avoid expensive background * The app should be aware of power status, and avoid expensive background
jobs when low on battery or run flat out when plugged in. jobs when low on battery or run flat out when plugged in.