# [PATCH 2/2] tests: fix cleanup after tests in t1509-root-worktree 2 messages from 2015-08-05 to 2015-08-05. Participants: Patrick Steinhardt. Thread: https://gitlist.dev/t/40016 ## Patrick Steinhardt, 2015-08-05 09:43 Subject: [PATCH 1/2] tests: fix broken && chains in t1509-root-worktree Message-ID: <1438767831-1620-1-git-send-email-ps@pks.im> URL: https://gitlist.dev/e/1438767831-1620-1-git-send-email-ps%40pks.im ``` Signed-off-by: Patrick Steinhardt --- These two patches have previously been part of my patch series fixing directory guessing. As Jeff King has been posting a patch that contains tests for cloning from a server's root without requiring t1509 I now post these two fixes as separate patches. t/t1509-root-worktree.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t1509-root-worktree.sh b/t/t1509-root-worktree.sh index b6977d4..0c80129 100755 --- a/t/t1509-root-worktree.sh +++ b/t/t1509-root-worktree.sh @@ -125,7 +125,7 @@ fi ONE_SHA1=d00491fd7e5bb6fa28c517a0bb32b8b506539d4d test_expect_success 'setup' ' - rm -rf /foo + rm -rf /foo && mkdir /foo && mkdir /foo/bar && echo 1 > /foo/foome && @@ -218,7 +218,7 @@ unset GIT_WORK_TREE test_expect_success 'go to /' 'cd /' test_expect_success 'setup' ' - rm -rf /.git + rm -rf /.git && echo "Initialized empty Git repository in /.git/" > expected && git init > result && test_cmp expected result @@ -241,8 +241,8 @@ say "auto bare gitdir" # DESTROYYYYY!!!!! test_expect_success 'setup' ' - rm -rf /refs /objects /info /hooks - rm /* + rm -rf /refs /objects /info /hooks && + rm /* && cd / && echo "Initialized empty Git repository in /" > expected && git init --bare > result && -- 2.5.0 ``` ## Patrick Steinhardt, 2015-08-05 09:43 Subject: [PATCH 2/2] tests: fix cleanup after tests in t1509-root-worktree Message-ID: <1438767831-1620-2-git-send-email-ps@pks.im> URL: https://gitlist.dev/e/1438767831-1620-2-git-send-email-ps%40pks.im In-Reply-To: <1438767831-1620-1-git-send-email-ps@pks.im> ``` During cleanup we do a simple 'rm /*' to remove leftover files from previous tests. As 'rm' errors out when there is anything it cannot delete and there are directories present at '/' it will throw an error, causing the '&&' chain to fail. Fix this by explicitly removing the files. Signed-off-by: Patrick Steinhardt --- t/t1509-root-worktree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1509-root-worktree.sh b/t/t1509-root-worktree.sh index 0c80129..553a3f6 100755 --- a/t/t1509-root-worktree.sh +++ b/t/t1509-root-worktree.sh @@ -242,7 +242,7 @@ say "auto bare gitdir" # DESTROYYYYY!!!!! test_expect_success 'setup' ' rm -rf /refs /objects /info /hooks && - rm /* && + rm -f /expected /ls.expected /me /result && cd / && echo "Initialized empty Git repository in /" > expected && git init --bare > result && -- 2.5.0 ```