t9123: use test_when_finished for cleanup
Move the setup logic into a 'test_expect_success' block. This ensures that the code is properly tracked by the test harness. Additionally, we use the 'test_when_finished' helper at the start of the block to ensure that the 'import' directory is removed even if the test fails. This is cleaner than the previous manual 'rm -rf import' approach. Signed-off-by: Siddharth Shrimali <r.siddharth.shrimali@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Siddharth Shrimali committed
Mar 5, 2026 at 18:24 UTC
63c00a677b2b44e0691919b36a417cee648d890d
1 file changed
+9
-6
t/t9123-git-svn-rebuild-with-rewriteroot.sh
+9
-6
index ead404589e..8fa5940abe 100755
--- a/t/t9123-git-svn-rebuild-with-rewriteroot.sh
+++ b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
@@ -7,12 +7,15 @@ test_description='git svn respects rewriteRoot during rebuild'
. ./lib-git-svn.sh
-mkdir import
-(cd import
- touch foo
- svn_cmd import -m 'import for git svn' . "$svnrepo" >/dev/null
-)
-rm -rf import
+test_expect_success 'setup svn repository' '
+ test_when_finished "rm -rf import" &&
+ mkdir import &&
+ (
+ cd import &&
+ touch foo &&
+ svn_cmd import -m "import for git svn" . "$svnrepo" >/dev/null
+ )
+ '
test_expect_success 'init, fetch and checkout repository' '
git svn init --rewrite-root=http://invalid.invalid/ "$svnrepo" &&