From 73950a6a0c87c9236753a15c18ec2b6c801c8dda Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 19 Nov 2024 12:54:23 -0400
Subject: [PATCH] split git-remote-annex test

---
 Test.hs                                        | 17 ++++++++++-------
 ...2_a58e3ebcd37f866d7154f66da8c01929._comment | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 doc/bugs/tests_started_to_fail_recently/comment_2_a58e3ebcd37f866d7154f66da8c01929._comment

diff --git a/Test.hs b/Test.hs
index 605bd85fc1..a850cae258 100644
--- a/Test.hs
+++ b/Test.hs
@@ -282,7 +282,8 @@ repoTests note numparts = map mk $ sep
 	[ testCase "add dup" test_add_dup
 	, testCase "add extras" test_add_extras
 	, testCase "add moved link" test_add_moved
-	, testCase "git-remote-annex" test_git_remote_annex
+	, testCase "git-remote-annex" (test_git_remote_annex False)
+	, testCase "git-remote-annex exporttree" (test_git_remote_annex True)
 	, testCase "readonly remote" test_readonly_remote
 	, testCase "ignore deleted files" test_ignore_deleted_files
 	, testCase "metadata" test_metadata
@@ -422,12 +423,14 @@ test_add_extras = intmpclonerepo $ do
 	annexed_present wormannexedfile
 	checkbackend wormannexedfile backendWORM
 
-test_git_remote_annex :: Assertion
-test_git_remote_annex = do
-	testspecialremote [] $ 
-		git_annex "copy" ["--to=foo"] "copy"
-	testspecialremote ["importtree=yes", "exporttree=yes"] $
-		git_annex "export" ["master", "--to=foo"] "export"
+test_git_remote_annex :: Bool -> Assertion
+test_git_remote_annex exporttree
+	| exporttree = 
+		testspecialremote ["importtree=yes", "exporttree=yes"] $
+			git_annex "export" ["master", "--to=foo"] "export"
+	| otherwise = 
+		testspecialremote [] $ 
+			git_annex "copy" ["--to=foo"] "copy"
   where
 	testspecialremote cfg populate = intmpclonerepo $ do
 		let cfg' = ["type=directory", "encryption=none", "directory=dir"] ++ cfg
diff --git a/doc/bugs/tests_started_to_fail_recently/comment_2_a58e3ebcd37f866d7154f66da8c01929._comment b/doc/bugs/tests_started_to_fail_recently/comment_2_a58e3ebcd37f866d7154f66da8c01929._comment
new file mode 100644
index 0000000000..ecc2322267
--- /dev/null
+++ b/doc/bugs/tests_started_to_fail_recently/comment_2_a58e3ebcd37f866d7154f66da8c01929._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2024-11-19T16:48:25Z"
+ content="""
+Re the OSX failure, it seems that somehow the manifest key is not being
+found when the test is run on OSX. I don't know why. There is nothing in
+this code that should be OSX-specific.
+
+Unfortunately I do have access to any OSX system to try to investigate
+this. The "datalads-mac" I used to use does not seem to exist anymore.
+
+Of course, this test could be skipped on OSX.
+
+Does occur to me this could somehow be exposing a deeper problem on OSX
+with exporttree special remotes. I have split the failing test in two, so
+we'll see if both fail, or only the exporttree one.
+"""]]