threads / patch / 38906

patcht1501: fix test with split index

Subject: [PATCH] t1501: fix test with split index

## tl;dr

3 messages between Mar 24, 2015 and Mar 24, 2015. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Thomas Gummerer· Mar 24, 2015, 17:35 UTC · lore

t1501-worktree.sh does not copy the shared index in the "relative $GIT_WORK_TREE and git subprocesses" test, which makes the test fail when GIT_TEST_SPLIT_INDEX is set. Copy the shared index as well in order to fix this.

Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
---

This applies on top of nd/multiple-work-trees. Sorry for not catching it earlier, but I haven't tried to run the test-suite for the next branch then, where this appears.

 t/t1501-worktree.sh | 1 +
 1 file changed, 1 insertion(+)

Show changes to t/t1501-worktree.sh +1 −0

diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh
index 4df7a2f..ce5c654 100755
--- a/t/t1501-worktree.sh
+++ b/t/t1501-worktree.sh
@@ -350,6 +350,7 @@ test_expect_success 'Multi-worktree setup' '
 	mkdir work &&
 	mkdir -p repo.git/repos/foo &&
 	cp repo.git/HEAD repo.git/index repo.git/repos/foo &&
+	( cp repo.git/sharedindex.* repo.git/repos/foo 2>/dev/null || : ) &&
 	sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE
 '

-- 
2.1.0.264.g0463184.dirty

Junio C Hamano· Mar 24, 2015, 17:58 UTC · re: Thomas Gummerer · lore

Re: [PATCH] t1501: fix test with split index

Thomas Gummerer <t.gummerer@gmail.com> writes:

Show 24 quoted lines

> t1501-worktree.sh does not copy the shared index in the "relative
> $GIT_WORK_TREE and git subprocesses" test, which makes the test fail
> when GIT_TEST_SPLIT_INDEX is set.  Copy the shared index as well in
> order to fix this.
>
> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
> ---
>
> This applies on top of nd/multiple-work-trees.  Sorry for not catching it
> earlier, but I haven't tried to run the test-suite for the next branch
> then, where this appears.
>
>  t/t1501-worktree.sh | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh
> index 4df7a2f..ce5c654 100755
> --- a/t/t1501-worktree.sh
> +++ b/t/t1501-worktree.sh
> @@ -350,6 +350,7 @@ test_expect_success 'Multi-worktree setup' '
>  	mkdir work &&
>  	mkdir -p repo.git/repos/foo &&
>  	cp repo.git/HEAD repo.git/index repo.git/repos/foo &&
> +	( cp repo.git/sharedindex.* repo.git/repos/foo 2>/dev/null || : ) &&

Is this a good place to use "test-might-fail", e.g.

	test_might_fail cp repo.git/sharedindex.* repo.git/repos/foo &&

or something?

>  	sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE
>  '

Thomas Gummerer· Mar 24, 2015, 19:21 UTC · re: Junio C Hamano · lore

[PATCH v2] t1501: fix test with split index

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
---

Show 5 quoted lines

> Is this a good place to use "test-might-fail", e.g.
>
>        test_might_fail cp repo.git/sharedindex.* repo.git/repos/foo &&
>
> or something?

Yeah that makes sense, thanks.

 t/t1501-worktree.sh | 1 +
 1 file changed, 1 insertion(+)

Show changes to t/t1501-worktree.sh +1 −0

diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh
index 4df7a2f..cc5b870 100755
--- a/t/t1501-worktree.sh
+++ b/t/t1501-worktree.sh
@@ -350,6 +350,7 @@ test_expect_success 'Multi-worktree setup' '
 	mkdir work &&
 	mkdir -p repo.git/repos/foo &&
 	cp repo.git/HEAD repo.git/index repo.git/repos/foo &&
+	test_might_fail cp repo.git/sharedindex.* repo.git/repos/foo &&
 	sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE
 '

-- 
2.1.0.264.g0463184.dirty