more fixes for test suite in direct mode

Still quite a few failures.

2 files changed, 11 insertions, 9 deletions

diff --git a/Test.hs b/Test.hs
index 374f496e3..a4ae46c17 100644
--- a/Test.hs
+++ b/Test.hs
@@ -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"
 		writeFile ingitfile $ content ingitfile
 		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"
 		unannexed ingitfile
 	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" []
 				@? "pre-commit failed"
 		else do
-			boolSystem "git" [Params "commit -q -a -m contentchanged"]
+			boolSystem "git" [Params "commit -q -m contentchanged"]
 				@? "git commit of edited file failed"
 	runchecks [checklink, checkunwritable] annexedfile
 	c <- readFile annexedfile
@@ -906,11 +906,14 @@ checkwritable f = do
 		Right _ -> return ()
 
 checkdangling :: FilePath -> Assertion
-checkdangling f = do
-	r <- tryIO $ readFile f
-	case r of
-		Left _ -> return () -- expected; dangling link
-		Right _ -> assertFailure $ f ++ " was not a dangling link as expected"
+checkdangling f = ifM (annexeval Config.crippledFileSystem)
+	( return () -- probably no real symlinks to test
+	, do
+		r <- tryIO $ readFile f
+		case r of
+			Left _ -> return () -- expected; dangling link
+			Right _ -> assertFailure $ f ++ " was not a dangling link as expected"
+	)
 
 checklocationlog :: FilePath -> Bool -> Assertion
 checklocationlog f expected = do
diff --git a/doc/design/assistant/android.mdwn b/doc/design/assistant/android.mdwn
index 83470c17e..aa681ebb3 100644
--- a/doc/design/assistant/android.mdwn
+++ b/doc/design/assistant/android.mdwn
@@ -25,8 +25,7 @@ to improve it.
   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
   currently install.
-* Get test suite to pass. Current failure is because `git fetch` is somehow
-  broken with local repositories.
+* Get test suite to pass.
 * 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
   jobs when low on battery or run flat out when plugged in.