64f0109f17
The shell+perl "[de]packetize()" helper functions were added in4414a15002(t/lib-git-daemon: add network-protocol helpers, 2018-01-24), and around the same time we added the "pkt-line" helper in74e7002961(test-pkt-line: introduce a packet-line test helper, 2018-03-14). For some reason it seems we've mostly used the shell+perl version instead of the helper since then. There were discussions around88124ab263(test-lib-functions: make packetize() more efficient, 2020-03-27) andcacae4329f(test-lib-functions: simplify packetize() stdin code, 2020-03-29) to improve them and make them more efficient. There was one good reason to do so, we needed an equivalent of "test-tool pkt-line pack", but that command wasn't capable of handling input with "\n" (a feature) or "\0" (just because it happens to be printf-based under the hood). Let's add a "pkt-line-raw" helper for that, and expose is at a packetize_raw() to go with the existing packetize() on the shell level, this gives us the smallest amount of change to the tests themselves. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
92 lines
3.3 KiB
Bash
92 lines
3.3 KiB
Bash
test_expect_success "setup receive.procReceiveRefs" '
|
|
git -C "$upstream" config --add receive.procReceiveRefs refs/for
|
|
'
|
|
|
|
test_expect_success "setup proc-receive hook" '
|
|
write_script "$upstream/hooks/proc-receive" <<-EOF
|
|
printf >&2 "# proc-receive hook\n"
|
|
test-tool proc-receive -v \
|
|
-r "ok refs/for/main/topic1" \
|
|
-r "option fall-through" \
|
|
-r "ok refs/for/main/topic2" \
|
|
-r "option refname refs/for/changes/23/123/1" \
|
|
-r "option new-oid $A" \
|
|
-r "ok refs/for/main/topic2" \
|
|
-r "option refname refs/for/changes/24/124/2" \
|
|
-r "option old-oid $B" \
|
|
-r "option new-oid $A" \
|
|
-r "option forced-update" \
|
|
-r "ng refs/for/next/topic target branch not exist"
|
|
EOF
|
|
'
|
|
|
|
# Refs of upstream : main(A)
|
|
# Refs of workbench: main(A) tags/v123
|
|
# git push : (B) refs/for/main/topic1(A) foo(A) refs/for/next/topic(A) refs/for/main/topic2(A)
|
|
test_expect_success "proc-receive: report status v1" '
|
|
{
|
|
if test -z "$GIT_DEFAULT_HASH" || test "$GIT_DEFAULT_HASH" = "sha1"
|
|
then
|
|
printf "%s %s refs/heads/main\0report-status\n" \
|
|
$A $B | packetize_raw
|
|
else
|
|
printf "%s %s refs/heads/main\0report-status object-format=$GIT_DEFAULT_HASH\n" \
|
|
$A $B | packetize_raw
|
|
fi &&
|
|
printf "%s %s refs/for/main/topic1\n" \
|
|
$ZERO_OID $A | packetize &&
|
|
printf "%s %s refs/heads/foo\n" \
|
|
$ZERO_OID $A | packetize &&
|
|
printf "%s %s refs/for/next/topic\n" \
|
|
$ZERO_OID $A | packetize &&
|
|
printf "%s %s refs/for/main/topic2\n" \
|
|
$ZERO_OID $A | packetize &&
|
|
printf 0000 &&
|
|
printf "" | git -C "$upstream" pack-objects --stdout
|
|
} | git receive-pack "$upstream" --stateless-rpc \
|
|
>out 2>&1 &&
|
|
make_user_friendly_and_stable_output <out >actual &&
|
|
cat >expect <<-EOF &&
|
|
# pre-receive hook
|
|
pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
|
|
pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
|
|
pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
|
|
pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
|
|
pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic2
|
|
# proc-receive hook
|
|
proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
|
|
proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
|
|
proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic2
|
|
proc-receive> ok refs/for/main/topic1
|
|
proc-receive> option fall-through
|
|
proc-receive> ok refs/for/main/topic2
|
|
proc-receive> option refname refs/for/changes/23/123/1
|
|
proc-receive> option new-oid <COMMIT-A>
|
|
proc-receive> ok refs/for/main/topic2
|
|
proc-receive> option refname refs/for/changes/24/124/2
|
|
proc-receive> option old-oid <COMMIT-B>
|
|
proc-receive> option new-oid <COMMIT-A>
|
|
proc-receive> option forced-update
|
|
proc-receive> ng refs/for/next/topic target branch not exist
|
|
000eunpack ok
|
|
0017ok refs/heads/main
|
|
001cok refs/for/main/topic1
|
|
0016ok refs/heads/foo
|
|
0033ng refs/for/next/topic target branch not exist
|
|
001cok refs/for/main/topic2
|
|
0000# post-receive hook
|
|
post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
|
|
post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
|
|
post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
|
|
post-receive< <ZERO-OID> <COMMIT-A> refs/for/changes/23/123/1
|
|
post-receive< <COMMIT-B> <COMMIT-A> refs/for/changes/24/124/2
|
|
EOF
|
|
test_cmp expect actual &&
|
|
|
|
test_cmp_refs -C "$upstream" <<-EOF
|
|
<COMMIT-A> refs/for/main/topic1
|
|
<COMMIT-A> refs/heads/foo
|
|
<COMMIT-B> refs/heads/main
|
|
EOF
|
|
'
|