t5411: use different out file to prevent overwriting

SZEDER reported that t5411 failed in Travis CI's s390x environment a
couple of times, and could be reproduced with '--stress' test on this
specific environment.  The test failure messages might look like this:

    + test_cmp expect actual
    --- expect      2021-01-17 21:55:23.430750004 +0000
    +++ actual      2021-01-17 21:55:23.430750004 +0000
    @@ -1 +1 @@
    -<COMMIT-A> refs/heads/main
    +<COMMIT-A> refs/heads/maifatal: the remote end hung up unexpectedly
    error: last command exited with $?=1
    not ok 86 - proc-receive: not support push options (builtin protocol)

The file 'actual' is filtered from the file 'out' which contains result
of 'git show-ref' command.  Due to the error messages from other process
is written into the file 'out' accidentally, t5411 failed.  SZEDER finds
the root cause of this issue:

 - 'git push' is executed with its standard output and error redirected
   to the file 'out'.

 - 'git push' executes 'git receive-pack' internally, which inherits
   the open file descriptors, so its output and error goes into that
   same 'out' file.

 - 'git push' ends without waiting for the close of 'git-receive-pack'
   for some cases, and the file 'out' is reused for test of
   'git show-ref' afterwards.

 - A mixture of the output of 'git show-ref' abd 'git receive-pack'
   leads to this issue.

The first intuitive reaction to resolve this issue is to remove the
file 'out' after use, so that the newly created file 'out' will have a
different file descriptor and will not be overwritten by the
'git receive-pack' process.  But Johannes pointed out that removing an
open file is not possible on Windows.  So we use different temporary
file names to store the output of 'git push' to solve this issue.

Reported-by: SZEDER Gábor <szeder.dev@gmail.com>
Helped-by: Johannes Sixt <j6t@kdbg.org>
Helped-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5411/test-0000-standard-git-push.sh b/t/t5411/test-0000-standard-git-push.sh
index 47b058af7ede47e7c8c3bdc2a5238c24e9edbec4..bdc4907191084cf69fe5aa16f8bb99a3ed1d0814 100644 (file)
--- a/t/t5411/test-0000-standard-git-push.sh
+++ b/t/t5411/test-0000-standard-git-push.sh
@@ -35,11 +35,11 @@ test_expect_success "git-push --atomic ($PROTOCOL)" '
        test_must_fail git -C workbench push --atomic origin \
                main \
                $B:refs/heads/next \
-               >out 2>&1 &&
+               >out-$test_count 2>&1 &&
        filter_out_user_friendly_and_stable_output \
                -e "/^To / { p; }" \
                -e "/^ ! / { p; }" \
-               <out >actual &&
+               <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
         ! [rejected] main -> main (non-fast-forward)
@@ -65,8 +65,8 @@ test_expect_success "non-fast-forward git-push ($PROTOCOL)" '
                push origin \
                main \
                $B:refs/heads/next \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/next

diff --git a/t/t5411/test-0001-standard-git-push--porcelain.sh b/t/t5411/test-0001-standard-git-push--porcelain.sh
index bbead12bbb48f5701d041e24954113795e2b90a2..59630ef7e542b5ca03ad9e02c1d811040143aa1b 100644 (file)
--- a/t/t5411/test-0001-standard-git-push--porcelain.sh
+++ b/t/t5411/test-0001-standard-git-push--porcelain.sh
@@ -36,12 +36,12 @@ test_expect_success "git-push --atomic ($PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --atomic --porcelain origin \
                main \
                $B:refs/heads/next \
-               >out 2>&1 &&
+               >out-$test_count 2>&1 &&
        filter_out_user_friendly_and_stable_output \
                -e "s/^# GETTEXT POISON #//" \
                -e "/^To / { p; }" \
                -e "/^! / { p; }" \
-               <out >actual &&
+               <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
        !    refs/heads/main:refs/heads/main    [rejected] (non-fast-forward)
@@ -67,8 +67,8 @@ test_expect_success "non-fast-forward git-push ($PROTOCOL/porcelain)" '
                push --porcelain origin \
                main \
                $B:refs/heads/next \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/next

diff --git a/t/t5411/test-0002-pre-receive-declined.sh b/t/t5411/test-0002-pre-receive-declined.sh
index e7d113a1587bbb2734e0850ba2341eb452eac090..c5c76bfe934caedbb9b9f43b46ab58f361192c81 100644 (file)
--- a/t/t5411/test-0002-pre-receive-declined.sh
+++ b/t/t5411/test-0002-pre-receive-declined.sh
@@ -12,8 +12,8 @@ test_expect_success "git-push is declined ($PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                $B:refs/heads/main \
                HEAD:refs/heads/next \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
         ! [remote rejected] <COMMIT-B> -> main (pre-receive hook declined)

diff --git a/t/t5411/test-0003-pre-receive-declined--porcelain.sh b/t/t5411/test-0003-pre-receive-declined--porcelain.sh
index cc0cca6a4721d6a96669b629c713208434b6a26f..45050b642a7e4f040df45189d53b45ec4ff2a5ee 100644 (file)
--- a/t/t5411/test-0003-pre-receive-declined--porcelain.sh
+++ b/t/t5411/test-0003-pre-receive-declined--porcelain.sh
@@ -12,8 +12,8 @@ test_expect_success "git-push is declined ($PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --porcelain origin \
                $B:refs/heads/main \
                HEAD:refs/heads/next \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
        !    <COMMIT-B>:refs/heads/main    [remote rejected] (pre-receive hook declined)

diff --git a/t/t5411/test-0011-no-hook-error.sh b/t/t5411/test-0011-no-hook-error.sh
index c50830982f73564a727125f85de512cfc24e3e73..77b45b0cbd7e424b885b18e89bd6ffa67b4ce939 100644 (file)
--- a/t/t5411/test-0011-no-hook-error.sh
+++ b/t/t5411/test-0011-no-hook-error.sh
@@ -5,8 +5,8 @@ test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL)
        test_must_fail git -C workbench push origin \
                HEAD:next \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
@@ -41,8 +41,8 @@ test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCO
        test_must_fail git -C workbench push --atomic origin \
                $B:main \
                HEAD:next \
-               HEAD:refs/for/main/topic >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main

diff --git a/t/t5411/test-0012-no-hook-error--porcelain.sh b/t/t5411/test-0012-no-hook-error--porcelain.sh
index 14ea43348110100fa896009a7781d32585f51568..142f4835e4e47e0d07a7a75ddba1a05886242275 100644 (file)
--- a/t/t5411/test-0012-no-hook-error--porcelain.sh
+++ b/t/t5411/test-0012-no-hook-error--porcelain.sh
@@ -5,8 +5,8 @@ test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL/
        test_must_fail git -C workbench push --porcelain origin \
                HEAD:next \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
@@ -42,8 +42,8 @@ test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCO
        test_must_fail git -C workbench push --porcelain --atomic origin \
                $B:main \
                HEAD:next \
-               HEAD:refs/for/main/topic >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main

diff --git a/t/t5411/test-0013-bad-protocol.sh b/t/t5411/test-0013-bad-protocol.sh
index b9be12be773bb4fa14d226202357afe08818b15b..bddface16319e7a2e9b9917ce7f359ad9f8e295b 100644 (file)
--- a/t/t5411/test-0013-bad-protocol.sh
+++ b/t/t5411/test-0013-bad-protocol.sh
@@ -11,8 +11,8 @@ test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL)" '
 test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
 
        # Check status report for git-push
        sed -n \
@@ -55,18 +55,18 @@ test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL
 test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
+               >out-$test_count 2>&1 &&
        filter_out_user_friendly_and_stable_output \
                -e "/^To / { p; }" \
                -e "/^ ! / { p; }" \
-               <out >actual &&
+               <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
         ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
        EOF
        test_cmp expect actual &&
-       grep "remote: fatal: die with the --die-read-version option" out &&
-       grep "remote: error: fail to negotiate version with proc-receive hook" out &&
+       grep "remote: fatal: die with the --die-read-version option" out-$test_count &&
+       grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
 
        git -C "$upstream" show-ref >out &&
        make_user_friendly_and_stable_output <out >actual &&
@@ -89,18 +89,18 @@ test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCO
 test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
+               >out-$test_count 2>&1 &&
        filter_out_user_friendly_and_stable_output \
                -e "/^To / { p; }" \
                -e "/^ ! / { p; }" \
-               <out >actual &&
+               <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
         ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
        EOF
        test_cmp expect actual &&
-       grep "remote: fatal: die with the --die-write-version option" out &&
-       grep "remote: error: fail to negotiate version with proc-receive hook" out &&
+       grep "remote: fatal: die with the --die-write-version option" out-$test_count &&
+       grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
 
        git -C "$upstream" show-ref >out &&
        make_user_friendly_and_stable_output <out >actual &&
@@ -123,17 +123,17 @@ test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCO
 test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
+               >out-$test_count 2>&1 &&
        filter_out_user_friendly_and_stable_output \
                -e "/^To / { p; }" \
                -e "/^ ! / { p; }" \
-               <out >actual &&
+               <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
         ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
        EOF
        test_cmp expect actual &&
-       grep "remote: fatal: die with the --die-read-commands option" out &&
+       grep "remote: fatal: die with the --die-read-commands option" out-$test_count &&
 
        git -C "$upstream" show-ref >out &&
        make_user_friendly_and_stable_output <out >actual &&
@@ -158,17 +158,17 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $
        test_must_fail git -C workbench push origin \
                -o reviewers=user1,user2 \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
+               >out-$test_count 2>&1 &&
        filter_out_user_friendly_and_stable_output \
                -e "/^To / { p; }" \
                -e "/^ ! / { p; }" \
-               <out >actual &&
+               <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
         ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
        EOF
        test_cmp expect actual &&
-       grep "remote: fatal: die with the --die-read-push-options option" out &&
+       grep "remote: fatal: die with the --die-read-push-options option" out-$test_count &&
 
        git -C "$upstream" show-ref >out &&
        make_user_friendly_and_stable_output <out >actual &&
@@ -191,17 +191,17 @@ test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL
 test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
+               >out-$test_count 2>&1 &&
        filter_out_user_friendly_and_stable_output \
                -e "/^To / { p; }" \
                -e "/^ ! / { p; }" \
-               <out >actual &&
+               <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
         ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
        EOF
        test_cmp expect actual &&
-       grep "remote: fatal: die with the --die-write-report option" out &&
+       grep "remote: fatal: die with the --die-write-report option" out-$test_count &&
 
        git -C "$upstream" show-ref >out &&
        make_user_friendly_and_stable_output <out >actual &&
@@ -224,8 +224,8 @@ test_expect_success "setup proc-receive hook (no report, $PROTOCOL)" '
 test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                HEAD:refs/heads/next \
-               HEAD:refs/for/main/topic >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
@@ -270,8 +270,8 @@ test_expect_success "setup proc-receive hook (no ref, $PROTOCOL)" '
 test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                HEAD:refs/for/main/topic\
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
@@ -306,8 +306,8 @@ test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL)" '
 test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                        HEAD:refs/for/main/topic \
-                       >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+                       >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic

diff --git a/t/t5411/test-0014-bad-protocol--porcelain.sh b/t/t5411/test-0014-bad-protocol--porcelain.sh
index fdb4569109ab0192abedd736a45e262f3b3335cb..64bfa27dcc5e21b1ca5574a16f419d9e8d18aff1 100644 (file)
--- a/t/t5411/test-0014-bad-protocol--porcelain.sh
+++ b/t/t5411/test-0014-bad-protocol--porcelain.sh
@@ -11,8 +11,8 @@ test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL/porcela
 test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --porcelain origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
 
        # Check status report for git-push
        sed -n \
@@ -55,18 +55,18 @@ test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL
 test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --porcelain origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
+               >out-$test_count 2>&1 &&
        filter_out_user_friendly_and_stable_output \
                -e "/^To / { p; n; p; n; p; }" \
-               <out >actual &&
+               <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
        !    HEAD:refs/for/main/topic    [remote rejected] (fail to run proc-receive hook)
        Done
        EOF
        test_cmp expect actual &&
-       grep "remote: fatal: die with the --die-read-version option" out &&
-       grep "remote: error: fail to negotiate version with proc-receive hook" out &&
+       grep "remote: fatal: die with the --die-read-version option" out-$test_count &&
+       grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
 
        git -C "$upstream" show-ref >out &&
        make_user_friendly_and_stable_output <out >actual &&
@@ -89,18 +89,18 @@ test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCO
 test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --porcelain origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
+               >out-$test_count 2>&1 &&
        filter_out_user_friendly_and_stable_output \
                -e "/^To / { p; n; p; n; p; }" \
-               <out >actual &&
+               <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
        !    HEAD:refs/for/main/topic    [remote rejected] (fail to run proc-receive hook)
        Done
        EOF
        test_cmp expect actual &&
-       grep "remote: fatal: die with the --die-write-version option" out &&
-       grep "remote: error: fail to negotiate version with proc-receive hook" out &&
+       grep "remote: fatal: die with the --die-write-version option" out-$test_count &&
+       grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
 
        git -C "$upstream" show-ref >out &&
        make_user_friendly_and_stable_output <out >actual &&
@@ -123,17 +123,17 @@ test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCO
 test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --porcelain origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
+               >out-$test_count 2>&1 &&
        filter_out_user_friendly_and_stable_output \
                -e "/^To / { p; n; p; n; p; }" \
-               <out >actual &&
+               <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
        !    HEAD:refs/for/main/topic    [remote rejected] (fail to run proc-receive hook)
        Done
        EOF
        test_cmp expect actual &&
-       grep "remote: fatal: die with the --die-read-commands option" out &&
+       grep "remote: fatal: die with the --die-read-commands option" out-$test_count &&
 
        git -C "$upstream" show-ref >out &&
        make_user_friendly_and_stable_output <out >actual &&
@@ -158,17 +158,17 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $
        test_must_fail git -C workbench push --porcelain origin \
                -o reviewers=user1,user2 \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
+               >out-$test_count 2>&1 &&
        filter_out_user_friendly_and_stable_output \
                -e "/^To / { p; n; p; n; p; }" \
-               <out >actual &&
+               <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
        !    HEAD:refs/for/main/topic    [remote rejected] (fail to run proc-receive hook)
        Done
        EOF
        test_cmp expect actual &&
-       grep "remote: fatal: die with the --die-read-push-options option" out &&
+       grep "remote: fatal: die with the --die-read-push-options option" out-$test_count &&
 
        git -C "$upstream" show-ref >out &&
        make_user_friendly_and_stable_output <out >actual &&
@@ -191,17 +191,17 @@ test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL
 test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --porcelain origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
+               >out-$test_count 2>&1 &&
        filter_out_user_friendly_and_stable_output \
                -e "/^To / { p; n; p; n; p; }" \
-               <out >actual &&
+               <out-$test_count >actual &&
        cat >expect <<-EOF &&
        To <URL/of/upstream.git>
        !    HEAD:refs/for/main/topic    [remote rejected] (fail to run proc-receive hook)
        Done
        EOF
        test_cmp expect actual &&
-       grep "remote: fatal: die with the --die-write-report option" out &&
+       grep "remote: fatal: die with the --die-write-report option" out-$test_count &&
 
        git -C "$upstream" show-ref >out &&
        make_user_friendly_and_stable_output <out >actual &&
@@ -224,8 +224,8 @@ test_expect_success "setup proc-receive hook (no report, $PROTOCOL/porcelain)" '
 test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --porcelain origin \
                HEAD:refs/heads/next \
-               HEAD:refs/for/main/topic >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
@@ -270,8 +270,8 @@ test_expect_success "setup proc-receive hook (no ref, $PROTOCOL/porcelain)" '
 test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --porcelain origin \
                HEAD:refs/for/main/topic\
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
@@ -307,8 +307,8 @@ test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL/porcelai
 test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --porcelain origin \
                        HEAD:refs/for/main/topic \
-                       >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+                       >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic

diff --git a/t/t5411/test-0020-report-ng.sh b/t/t5411/test-0020-report-ng.sh
index 5a9e0daf2d56829b9372a85b499ff1a815c8be62..6618c91841d64741992ad236705b857c13f4d1ce 100644 (file)
--- a/t/t5411/test-0020-report-ng.sh
+++ b/t/t5411/test-0020-report-ng.sh
@@ -12,8 +12,8 @@ test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL)" '
 test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
@@ -46,8 +46,8 @@ test_expect_success "setup proc-receive hook (ng message, $PROTOCOL)" '
 test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic

diff --git a/t/t5411/test-0021-report-ng--porcelain.sh b/t/t5411/test-0021-report-ng--porcelain.sh
index 93475a83cfcb9c9e0faeed7d94a4bec6cec3ffaa..44ad1c7de4ff32cb4e2fe2c0df809dbd37a3da31 100644 (file)
--- a/t/t5411/test-0021-report-ng--porcelain.sh
+++ b/t/t5411/test-0021-report-ng--porcelain.sh
@@ -12,8 +12,8 @@ test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL/porcelai
 test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --porcelain origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
@@ -47,8 +47,8 @@ test_expect_success "setup proc-receive hook (ng message, $PROTOCOL/porcelain)"
 test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --porcelain origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic

diff --git a/t/t5411/test-0022-report-unexpect-ref.sh b/t/t5411/test-0022-report-unexpect-ref.sh
index f8be8a0ba1adcf08ba8564406999c1068f19a1c5..b0c5a6e168f0422111b5be63123b291e941d96b3 100644 (file)
--- a/t/t5411/test-0022-report-unexpect-ref.sh
+++ b/t/t5411/test-0022-report-unexpect-ref.sh
@@ -13,8 +13,8 @@ test_expect_success "proc-receive: report unexpected ref ($PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                $B:refs/heads/main \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main

diff --git a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh
index 778150fa03257ae0e3213a3b86f2ab5da2d82ce4..212927b8dc141c89c4d32c0613312db3c84b5b8e 100644 (file)
--- a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh
+++ b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh
@@ -13,8 +13,8 @@ test_expect_success "proc-receive: report unexpected ref ($PROTOCOL/porcelain)"
        test_must_fail git -C workbench push --porcelain origin \
                $B:refs/heads/main \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main

diff --git a/t/t5411/test-0024-report-unknown-ref.sh b/t/t5411/test-0024-report-unknown-ref.sh
index d4e74e46811ee880edf14277b49cb8443e075c9a..94ffad55f234abdffb4981b1180c9b8b7b97eec7 100644 (file)
--- a/t/t5411/test-0024-report-unknown-ref.sh
+++ b/t/t5411/test-0024-report-unknown-ref.sh
@@ -12,8 +12,8 @@ test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" '
 test_expect_success "proc-receive: report unknown reference ($PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                HEAD:refs/for/a/b/c/my/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic

diff --git a/t/t5411/test-0025-report-unknown-ref--porcelain.sh b/t/t5411/test-0025-report-unknown-ref--porcelain.sh
index 039e8b61637ce585c1f98fb03267e257132ed205..8ee7e664729dd6bb736679bcbc287bf3c2a760c8 100644 (file)
--- a/t/t5411/test-0025-report-unknown-ref--porcelain.sh
+++ b/t/t5411/test-0025-report-unknown-ref--porcelain.sh
@@ -12,8 +12,8 @@ test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelai
 test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --porcelain origin \
                HEAD:refs/for/a/b/c/my/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic

diff --git a/t/t5411/test-0026-push-options.sh b/t/t5411/test-0026-push-options.sh
index e88edb16a445c88f008f2b82aab8c61e4ff47d55..bb2cf59bdcd6907e448fa1860a8fc10fac10556b 100644 (file)
--- a/t/t5411/test-0026-push-options.sh
+++ b/t/t5411/test-0026-push-options.sh
@@ -16,8 +16,8 @@ test_expect_success "proc-receive: not support push options ($PROTOCOL)" '
                -o reviewer=user1 \
                origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        test_i18ngrep "fatal: the receiving end does not support push options" \
                actual &&
        git -C "$upstream" show-ref >out &&

diff --git a/t/t5411/test-0027-push-options--porcelain.sh b/t/t5411/test-0027-push-options--porcelain.sh
index 3a6561b5eab465b3b9eab20e29a3c4fa992d6a7c..54e4f8f1d20b353a8b946a4ed898311304d71415 100644 (file)
--- a/t/t5411/test-0027-push-options--porcelain.sh
+++ b/t/t5411/test-0027-push-options--porcelain.sh
@@ -17,8 +17,8 @@ test_expect_success "proc-receive: not support push options ($PROTOCOL/porcelain
                -o reviewer=user1 \
                origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        test_i18ngrep "fatal: the receiving end does not support push options" \
                actual &&
        git -C "$upstream" show-ref >out &&

diff --git a/t/t5411/test-0032-report-with-options.sh b/t/t5411/test-0032-report-with-options.sh
index a0faf5c7ff04d414f22e79e688bcc23a0452fff0..e6aa0f7018acb8282226119f61a2471f288d5bd8 100644 (file)
--- a/t/t5411/test-0032-report-with-options.sh
+++ b/t/t5411/test-0032-report-with-options.sh
@@ -13,8 +13,8 @@ test_expect_success "setup proc-receive hook (option without matching ok, $PROTO
 test_expect_success "proc-receive: report option without matching ok ($PROTOCOL)" '
        test_must_fail git -C workbench push origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic

diff --git a/t/t5411/test-0033-report-with-options--porcelain.sh b/t/t5411/test-0033-report-with-options--porcelain.sh
index 32ae26bcfb0e5b9b2ce106fe1443ecaed9fd0cb9..a8ca5dd0dd162a2943ee45faf0c9df7dc0fb5210 100644 (file)
--- a/t/t5411/test-0033-report-with-options--porcelain.sh
+++ b/t/t5411/test-0033-report-with-options--porcelain.sh
@@ -13,8 +13,8 @@ test_expect_success "setup proc-receive hook (option without matching ok, $PROTO
 test_expect_success "proc-receive: report option without matching ok ($PROTOCOL/porcelain)" '
        test_must_fail git -C workbench push --porcelain origin \
                HEAD:refs/for/main/topic \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic

diff --git a/t/t5411/test-0038-report-mixed-refs.sh b/t/t5411/test-0038-report-mixed-refs.sh
index 0d071ebaa6c9dc8cd40bca37d8e4806d2b94cd6e..286f80d4237dc6b514ac7b8a45ea217e723987f2 100644 (file)
--- a/t/t5411/test-0038-report-mixed-refs.sh
+++ b/t/t5411/test-0038-report-mixed-refs.sh
@@ -24,8 +24,8 @@ test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL)" '
                HEAD:refs/heads/foo \
                HEAD:refs/for/main/topic \
                HEAD:refs/for/next/topic3 \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main

diff --git a/t/t5411/test-0039-report-mixed-refs--porcelain.sh b/t/t5411/test-0039-report-mixed-refs--porcelain.sh
index d8409912fd3af493f116a0ae735f0b5bd821552a..939b8a3b4f17c3cc227ff0537b08dc773ce8c9fc 100644 (file)
--- a/t/t5411/test-0039-report-mixed-refs--porcelain.sh
+++ b/t/t5411/test-0039-report-mixed-refs--porcelain.sh
@@ -24,8 +24,8 @@ test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL/porcel
                HEAD:refs/heads/foo \
                HEAD:refs/for/main/topic \
                HEAD:refs/for/next/topic3 \
-               >out 2>&1 &&
-       make_user_friendly_and_stable_output <out >actual &&
+               >out-$test_count 2>&1 &&
+       make_user_friendly_and_stable_output <out-$test_count >actual &&
        cat >expect <<-EOF &&
        remote: # pre-receive hook
        remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main