git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/2] t5541: generalize reference locking

From
Justin Tobler via GitGitGadget <gitgitgadget@gmail.com>
Date
Jan 10, 2024, 18:52 UTC
Message-ID
<11fd5091d61b54d8862ab2e316bbd25fff63ce0f.1704912750.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.1634.git.1704912750.gitgitgadget@gmail.com>
From: Justin Tobler <jltobler@gmail.com>

Some tests set up reference locks by directly creating the lockfile. While this works for the files reference backend, reftable reference locks operate differently and are incompatible with this approach. Generalize reference locking by preparing a reference transaction.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
---
 t/t5541-http-push-smart.sh | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index df758e187df..5b94c0b066f 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -232,8 +232,29 @@ test_expect_success 'push --atomic fails on server-side errors' '
 	test_config -C "$d" http.receivepack true &&
 	up="$HTTPD_URL"/smart/atomic-branches.git &&
 
-	# break ref updates for other on the remote site
-	mkdir "$d/refs/heads/other.lock" &&
+	mkfifo in out &&
+	(git -C "$d" update-ref --stdin <in >out &) &&
+
+	exec 9>in &&
+	exec 8<out &&
+	test_when_finished "exec 9>&-" &&
+	test_when_finished "exec 8<&-" &&
+
+	echo "start" >&9 &&
+	echo "start: ok" >expected &&
+	read line <&8 &&
+	echo "$line" >actual &&
+	test_cmp expected actual &&
+
+	echo "update refs/heads/other refs/heads/other" >&9 &&
+
+	# Prepare reference transaction on `other` reference to lock it and thus
+	# break updates on the remote.
+	echo "prepare" >&9 &&
+	echo "prepare: ok" >expected &&
+	read line <&8 &&
+	echo "$line" >actual &&
+	test_cmp expected actual &&
 
 	# add the new commit to other
 	git branch -f other collateral &&
-- 
gitgitgadget
Previous: Justin ToblerNext: Jeff King
Message 9 of 20 in “Generalize reference locking in tests”
  1. 0/2 Generalize reference locking in testsJustin Tobler via GitGitGadget, Jan 10, 2024
  2. 1/2 t1401: generalize reference lockingJustin Tobler via GitGitGadget, Jan 10, 2024
  3. Jeff KingJan 11, 2024
  4. Patrick SteinhardtJan 11, 2024
  5. Jeff KingJan 12, 2024
  6. Patrick SteinhardtJan 12, 2024
  7. Jeff KingJan 12, 2024
  8. Justin ToblerJan 11, 2024
  9. 2/2 t5541: generalize reference lockingJustin Tobler via GitGitGadget, Jan 10, 2024
  10. Jeff KingJan 11, 2024
  11. Junio C HamanoJan 11, 2024
  12. Justin ToblerJan 11, 2024
  13. Junio C HamanoJan 11, 2024
  14. Justin ToblerJan 11, 2024
  15. 0/2 Generalize reference locking in testsJustin Tobler via GitGitGadget, Jan 11, 2024
  16. 1/2 t1401: remove lockfile creationJustin Tobler via GitGitGadget, Jan 11, 2024
  17. 2/2 t5541: remove lockfile creationJustin Tobler via GitGitGadget, Jan 11, 2024
  18. Jeff KingJan 12, 2024
  19. Junio C HamanoJan 12, 2024
  20. Justin ToblerJan 13, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.