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

[PATCH 3/3] t1509: facilitate repeated script invocations

From
Eric Sunshine via GitGitGadget <gitgitgadget@gmail.com>
Date
Nov 21, 2022, 03:00 UTC
Message-ID
<97ada2a1202190776ce3989d3841dd47e2702316.1668999621.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.1425.git.1668999621.gitgitgadget@gmail.com>
From: Eric Sunshine <sunshine@sunshineco.com>

t1509-root-work-tree.sh, which tests behavior of a Git repository located at the root `/` directory, refuses to run if it detects the presence of an existing repository at `/`. This safeguard ensures that it won't clobber a legitimate repository at that location. However, because t1509 does a poor job of cleaning up after itself, it runs afoul of its own safety check on subsequent runs, which makes it painful to run the script repeatedly since each run requires manual cleanup of detritus from the previous run.

Address this shortcoming by making t1509 clean up after itself as its last action. This is safe since the script can only make it to this cleanup action if it did not find a legitimate repository at `/` in the first place, so the resources cleaned up here can only have been created by the script itself.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---
 t/t1509-root-work-tree.sh | 5 +++++
 1 file changed, 5 insertions(+)
diff --git a/t/t1509-root-work-tree.sh b/t/t1509-root-work-tree.sh
index d0417626280..c799f5b6aca 100755
--- a/t/t1509-root-work-tree.sh
+++ b/t/t1509-root-work-tree.sh
@@ -256,4 +256,9 @@ test_expect_success 'go to /foo' 'cd /foo'
 
 test_vars 'auto gitdir, root' "/" "" ""
 
+test_expect_success 'cleanup root' '
+	rm -rf /.git /refs /objects /info /hooks /branches /foo &&
+	rm -f /HEAD /config /description /expected /ls.expected /me /result
+'
+
 test_done
-- 
gitgitgadget
Previous: Johannes SchindelinNext: Ævar Arnfjörð Bjarmason
Message 6 of 14 in “fix t1509-root-work-tree failure”
  1. 0/3 fix t1509-root-work-tree failureEric Sunshine via GitGitGadget, Nov 21, 2022
  2. 1/3 t1509: fix failing "root work tree" test due to owner-checkEric Sunshine via GitGitGadget, Nov 21, 2022
  3. Johannes SchindelinDec 8, 2022
  4. 2/3 t1509: make "setup" test more robustEric Sunshine via GitGitGadget, Nov 21, 2022
  5. Johannes SchindelinDec 8, 2022
  6. 3/3 t1509: facilitate repeated script invocationsEric Sunshine via GitGitGadget, Nov 21, 2022
  7. Ævar Arnfjörð BjarmasonDec 6, 2022
  8. Eric SunshineDec 6, 2022
  9. Johannes SchindelinDec 8, 2022
  10. "test_atexit" v.s. "test_when_finished" (was: [PATCH 3/3] t1509: facilitate repeated script invocations)Ævar Arnfjörð Bjarmason, Dec 8, 2022
  11. Junio C HamanoDec 9, 2022
  12. Eric SunshineDec 5, 2022
  13. Johannes SchindelinDec 8, 2022
  14. Eric SunshineDec 9, 2022

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.