mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
c39176b160
Change the t5411/*.sh tests to use the test_hook helper instead of "write_script". Unfortunately these tests do the setup and test across different test_expect_success blocks, so we have to use --clobber (implying --setup) for these. Let's change those that can use a quoted here-doc to do so while we're at it. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
262 lines
11 KiB
Bash
262 lines
11 KiB
Bash
test_expect_success "setup proc-receive hook (option without matching ok, $PROTOCOL/porcelain)" '
|
|
test_hook -C "$upstream" --clobber proc-receive <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "option refname refs/pull/123/head" \
|
|
-r "option old-oid $B"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
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-$test_count 2>&1 &&
|
|
make_user_friendly_and_stable_output <out-$test_count >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> remote: # pre-receive hook Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: # proc-receive hook Z
|
|
> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: proc-receive> option refname refs/pull/123/head Z
|
|
> remote: proc-receive> option old-oid <COMMIT-B> Z
|
|
> remote: error: proc-receive reported "option" without a matching "ok/ng" directive Z
|
|
> To <URL/of/upstream.git>
|
|
> ! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status)
|
|
> Done
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "setup proc-receive hook (option refname, $PROTOCOL/porcelain)" '
|
|
test_hook -C "$upstream" --clobber proc-receive <<-\EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/main/topic" \
|
|
-r "option refname refs/pull/123/head"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: report option refname ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
HEAD:refs/for/main/topic \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> remote: # pre-receive hook Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: # proc-receive hook Z
|
|
> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: proc-receive> ok refs/for/main/topic Z
|
|
> remote: proc-receive> option refname refs/pull/123/head Z
|
|
> remote: # post-receive hook Z
|
|
> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head Z
|
|
> To <URL/of/upstream.git>
|
|
> * HEAD:refs/pull/123/head [new reference]
|
|
> Done
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "setup proc-receive hook (option refname and forced-update, $PROTOCOL/porcelain)" '
|
|
test_hook -C "$upstream" --clobber proc-receive <<-\EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/main/topic" \
|
|
-r "option refname refs/pull/123/head" \
|
|
-r "option forced-update"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: report option refname and forced-update ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
HEAD:refs/for/main/topic \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> remote: # pre-receive hook Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: # proc-receive hook Z
|
|
> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: proc-receive> ok refs/for/main/topic Z
|
|
> remote: proc-receive> option refname refs/pull/123/head Z
|
|
> remote: proc-receive> option forced-update Z
|
|
> remote: # post-receive hook Z
|
|
> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head Z
|
|
> To <URL/of/upstream.git>
|
|
> * HEAD:refs/pull/123/head [new reference]
|
|
> Done
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTOCOL/porcelain)" '
|
|
test_hook -C "$upstream" --clobber proc-receive <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/main/topic" \
|
|
-r "option refname refs/pull/123/head" \
|
|
-r "option old-oid $B"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
HEAD:refs/for/main/topic \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> remote: # pre-receive hook Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: # proc-receive hook Z
|
|
> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: proc-receive> ok refs/for/main/topic Z
|
|
> remote: proc-receive> option refname refs/pull/123/head Z
|
|
> remote: proc-receive> option old-oid <COMMIT-B> Z
|
|
> remote: # post-receive hook Z
|
|
> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/123/head Z
|
|
> To <URL/of/upstream.git>
|
|
> HEAD:refs/pull/123/head <COMMIT-B>..<COMMIT-A>
|
|
> Done
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL/porcelain)" '
|
|
test_hook -C "$upstream" --clobber proc-receive <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/main/topic" \
|
|
-r "option old-oid $B"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: report option old-oid ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
HEAD:refs/for/main/topic \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> remote: # pre-receive hook Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: # proc-receive hook Z
|
|
> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: proc-receive> ok refs/for/main/topic Z
|
|
> remote: proc-receive> option old-oid <COMMIT-B> Z
|
|
> remote: # post-receive hook Z
|
|
> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/for/main/topic Z
|
|
> To <URL/of/upstream.git>
|
|
> HEAD:refs/for/main/topic <COMMIT-B>..<COMMIT-A>
|
|
> Done
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTOCOL/porcelain)" '
|
|
test_hook -C "$upstream" --clobber proc-receive <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/main/topic" \
|
|
-r "option old-oid $A" \
|
|
-r "option new-oid $B"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
HEAD:refs/for/main/topic \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> remote: # pre-receive hook Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: # proc-receive hook Z
|
|
> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: proc-receive> ok refs/for/main/topic Z
|
|
> remote: proc-receive> option old-oid <COMMIT-A> Z
|
|
> remote: proc-receive> option new-oid <COMMIT-B> Z
|
|
> remote: # post-receive hook Z
|
|
> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic Z
|
|
> To <URL/of/upstream.git>
|
|
> HEAD:refs/for/main/topic <COMMIT-A>..<COMMIT-B>
|
|
> Done
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "setup proc-receive hook (report with multiple rewrites, $PROTOCOL/porcelain)" '
|
|
test_hook -C "$upstream" --clobber proc-receive <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/a/b/c/topic" \
|
|
-r "ok refs/for/next/topic" \
|
|
-r "option refname refs/pull/123/head" \
|
|
-r "ok refs/for/main/topic" \
|
|
-r "option refname refs/pull/124/head" \
|
|
-r "option old-oid $B" \
|
|
-r "option forced-update" \
|
|
-r "option new-oid $A"
|
|
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
|
|
test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL/porcelain)" '
|
|
git -C workbench push --porcelain origin \
|
|
HEAD:refs/for/next/topic \
|
|
HEAD:refs/for/a/b/c/topic \
|
|
HEAD:refs/for/main/topic \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
format_and_save_expect <<-EOF &&
|
|
> remote: # pre-receive hook Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic Z
|
|
> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: # proc-receive hook Z
|
|
> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic Z
|
|
> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic Z
|
|
> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic Z
|
|
> remote: proc-receive> ok refs/for/a/b/c/topic Z
|
|
> remote: proc-receive> ok refs/for/next/topic Z
|
|
> remote: proc-receive> option refname refs/pull/123/head Z
|
|
> remote: proc-receive> ok refs/for/main/topic Z
|
|
> remote: proc-receive> option refname refs/pull/124/head Z
|
|
> remote: proc-receive> option old-oid <COMMIT-B> Z
|
|
> remote: proc-receive> option forced-update Z
|
|
> remote: proc-receive> option new-oid <COMMIT-A> Z
|
|
> remote: # post-receive hook Z
|
|
> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head Z
|
|
> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic Z
|
|
> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head Z
|
|
> To <URL/of/upstream.git>
|
|
> * HEAD:refs/pull/123/head [new reference]
|
|
> * HEAD:refs/for/a/b/c/topic [new reference]
|
|
> + HEAD:refs/pull/124/head <COMMIT-B>...<COMMIT-A> (forced update)
|
|
> Done
|
|
EOF
|
|
test_cmp expect actual &&
|
|
|
|
test_cmp_refs -C "$upstream" <<-EOF
|
|
<COMMIT-A> refs/heads/main
|
|
EOF
|
|
'
|