2bafb3d702
Before comparing with the expect file, we used to call function "make_user_friendly_and_stable_output" to filter out trailing spaces in output. Ævar recommends using pattern "s/Z$//" to prepare expect file, and then compare it with raw output. Since we have fixed the issue of occasionally missing the clear-to-eol suffix when displaying sideband #2 messages, it is safe and stable to test against raw output. Suggested-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
44 lines
1.6 KiB
Bash
44 lines
1.6 KiB
Bash
test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" '
|
|
write_script "$upstream/hooks/proc-receive" <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/heads/main"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : (B) refs/for/main/topic
|
|
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-$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< <COMMIT-A> <COMMIT-B> refs/heads/main 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/heads/main Z
|
|
> remote: error: proc-receive reported status on unexpected ref: refs/heads/main Z
|
|
> remote: # post-receive hook Z
|
|
> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main Z
|
|
> To <URL/of/upstream.git>
|
|
> <OID-A>..<OID-B> <COMMIT-B> -> main
|
|
> ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
|
|
EOF
|
|
test_cmp expect actual &&
|
|
|
|
test_cmp_refs -C "$upstream" <<-EOF
|
|
<COMMIT-B> refs/heads/main
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(B)
|
|
# Refs of workbench: main(A) tags/v123
|
|
test_expect_success "cleanup ($PROTOCOL)" '
|
|
git -C "$upstream" update-ref refs/heads/main $A
|
|
'
|