mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5548: refactor test cases by resetting upstream

Browse Source 
Refactor the test cases with the following changes:

 - Calling setup_upstream() to reset upstream after running each test
   case.

 - Change the initial branch tips of the workspace to reduce the branch
   setup operations in the workspace.

 - Reduced the two steps of setting up and cleaning up the pre-receive
   hook by moving the operations into the corresponding test case,

Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jiang Xin
2025-02-03 07:29:33 +01:00
committed by Junio C Hamano
parent 12ad6b8fea
commit bc0f5939a5
1 changed files with 67 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
t/t5548-push-porcelain.sh
View File

@ -94,8 +94,8 @@ setup_upstream_and_workbench () {
fi fi
upstream="$1" upstream="$1"
# Upstream after setup : main(B) foo(A) bar(A) baz(A) # Upstream after setup: main(B) foo(A) bar(A) baz(A)
# Workbench after setup : main(A) # Workbench after setup: main(A) baz(A) next(A)
test_expect_success "setup upstream repository and workbench" ' test_expect_success "setup upstream repository and workbench" '
setup_upstream "$upstream" && setup_upstream "$upstream" &&
rm -rf workbench && rm -rf workbench &&
@ -103,6 +103,8 @@ setup_upstream_and_workbench () {
( (
cd workbench && cd workbench &&
git update-ref refs/heads/main $A && git update-ref refs/heads/main $A &&
git update-ref refs/heads/baz $A &&
git update-ref refs/heads/next $A &&
# Try to make a stable fixed width for abbreviated commit ID, # Try to make a stable fixed width for abbreviated commit ID,
# this fixed-width oid will be replaced with "<OID>". # this fixed-width oid will be replaced with "<OID>".
git config core.abbrev 7 && git config core.abbrev 7 &&
@ -131,19 +133,14 @@ run_git_push_porcelain_output_test() {
# Refs of upstream : main(B) foo(A) bar(A) baz(A) # Refs of upstream : main(B) foo(A) bar(A) baz(A)
# Refs of workbench: main(A) baz(A) next(A) # Refs of workbench: main(A) baz(A) next(A)
# git-push : main(A) NULL (B) baz(A) next(A) # git-push : main(A) NULL (B) baz(A) next(A)
test_expect_success "porcelain output of successful git-push ($PROTOCOL)" ' test_expect_success ".. git-push --porcelain --force ($PROTOCOL)" '
( test_when_finished "setup_upstream \"$upstream\"" &&
cd workbench && git -C workbench push --porcelain --force origin \
git update-ref refs/heads/main $A && main \
git update-ref refs/heads/baz $A && :refs/heads/foo \
git update-ref refs/heads/next $A && $B:bar \
git push --porcelain --force origin \ baz \
main \ next >out &&
:refs/heads/foo \
$B:bar \
baz \
next
) >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
format_and_save_expect <<-EOF && format_and_save_expect <<-EOF &&
> To <URL/of/upstream.git> > To <URL/of/upstream.git>
@ -167,115 +164,103 @@ run_git_push_porcelain_output_test() {
test_cmp expect actual test_cmp expect actual
' '
# Refs of upstream : main(A) bar(B) baz(A) next(A) # Refs of upstream : main(B) foo(A) bar(A) baz(A)
# Refs of workbench: main(B) bar(A) baz(A) next(A) # Refs of workbench: main(A) baz(A) next(A)
# git-push : main(B) bar(A) NULL next(A) # git-push : main(A) NULL (B) baz(A) next(A)
test_expect_success "atomic push failed ($PROTOCOL)" ' test_expect_success ".. git push --porcelain --atomic ($PROTOCOL)" '
( test_when_finished "setup_upstream \"$upstream\"" &&
cd workbench && test_must_fail git -C workbench push --porcelain --atomic origin \
git update-ref refs/heads/main $B && main \
git update-ref refs/heads/bar $A && :refs/heads/foo \
test_must_fail git push --atomic --porcelain origin \ $B:bar \
main \ baz \
bar \ next >out &&
:baz \
next
) >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
format_and_save_expect <<-EOF && format_and_save_expect <<-EOF &&
To <URL/of/upstream.git> > To <URL/of/upstream.git>
> = refs/heads/next:refs/heads/next [up to date] > = refs/heads/baz:refs/heads/baz [up to date]
> ! refs/heads/bar:refs/heads/bar [rejected] (non-fast-forward) > ! <COMMIT-B>:refs/heads/bar [rejected] (atomic push failed)
> ! (delete):refs/heads/baz [rejected] (atomic push failed) > ! (delete):refs/heads/foo [rejected] (atomic push failed)
> ! refs/heads/main:refs/heads/main [rejected] (atomic push failed) > ! refs/heads/main:refs/heads/main [rejected] (non-fast-forward)
Done > ! refs/heads/next:refs/heads/next [rejected] (atomic push failed)
> Done
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-B> refs/heads/bar <COMMIT-A> refs/heads/bar
<COMMIT-A> refs/heads/baz <COMMIT-A> refs/heads/baz
<COMMIT-A> refs/heads/main <COMMIT-A> refs/heads/foo
<COMMIT-A> refs/heads/next <COMMIT-B> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
test_expect_success "prepare pre-receive hook ($PROTOCOL)" ' # Refs of upstream : main(B) foo(A) bar(A) baz(A)
test_hook --setup -C "$upstream" pre-receive <<-EOF # Refs of workbench: main(A) baz(A) next(A)
exit 1 # git-push : main(A) NULL (B) baz(A) next(A)
test_expect_success ".. pre-receive hook declined ($PROTOCOL)" '
test_when_finished "rm -f \"$upstream/hooks/pre-receive\" &&
setup_upstream \"$upstream\"" &&
test_hook --setup -C "$upstream" pre-receive <<-EOF &&
exit 1
EOF EOF
' test_must_fail git -C workbench push --porcelain --force origin \
main \
# Refs of upstream : main(A) bar(B) baz(A) next(A) :refs/heads/foo \
# Refs of workbench: main(B) bar(A) baz(A) next(A) $B:bar \
# git-push : main(B) bar(A) NULL next(A) baz \
test_expect_success "pre-receive hook declined ($PROTOCOL)" ' next >out &&
(
cd workbench &&
git update-ref refs/heads/main $B &&
git update-ref refs/heads/bar $A &&
test_must_fail git push --porcelain --force origin \
main \
bar \
:baz \
next
) >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
format_and_save_expect <<-EOF && format_and_save_expect <<-EOF &&
To <URL/of/upstream.git> > To <URL/of/upstream.git>
> = refs/heads/next:refs/heads/next [up to date] > = refs/heads/baz:refs/heads/baz [up to date]
> ! refs/heads/bar:refs/heads/bar [remote rejected] (pre-receive hook declined) > ! <COMMIT-B>:refs/heads/bar [remote rejected] (pre-receive hook declined)
> ! :refs/heads/baz [remote rejected] (pre-receive hook declined) > ! :refs/heads/foo [remote rejected] (pre-receive hook declined)
> ! refs/heads/main:refs/heads/main [remote rejected] (pre-receive hook declined) > ! refs/heads/main:refs/heads/main [remote rejected] (pre-receive hook declined)
Done > ! refs/heads/next:refs/heads/next [remote rejected] (pre-receive hook declined)
> Done
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-B> refs/heads/bar <COMMIT-A> refs/heads/bar
<COMMIT-A> refs/heads/baz <COMMIT-A> refs/heads/baz
<COMMIT-A> refs/heads/main <COMMIT-A> refs/heads/foo
<COMMIT-A> refs/heads/next <COMMIT-B> refs/heads/main
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
test_expect_success "remove pre-receive hook ($PROTOCOL)" ' # Refs of upstream : main(B) foo(A) bar(A) baz(A)
rm "$upstream/hooks/pre-receive" # Refs of workbench: main(A) baz(A) next(A)
' # git-push : main(A) next(A)
test_expect_success ".. non-fastforward push ($PROTOCOL)" '
# Refs of upstream : main(A) bar(B) baz(A) next(A)
# Refs of workbench: main(B) bar(A) baz(A) next(A)
# git-push : main(B) bar(A) NULL next(A)
test_expect_success "non-fastforward push ($PROTOCOL)" '
( (
cd workbench && cd workbench &&
test_must_fail git push --porcelain origin \ test_must_fail git push --porcelain origin \
main \ main \
bar \
:baz \
next next
) >out && ) >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
format_and_save_expect <<-EOF && format_and_save_expect <<-EOF &&
To <URL/of/upstream.git> > To <URL/of/upstream.git>
> = refs/heads/next:refs/heads/next [up to date] > * refs/heads/next:refs/heads/next [new branch]
> - :refs/heads/baz [deleted] > ! refs/heads/main:refs/heads/main [rejected] (non-fast-forward)
> refs/heads/main:refs/heads/main <COMMIT-A>..<COMMIT-B> > Done
> ! refs/heads/bar:refs/heads/bar [rejected] (non-fast-forward)
Done
EOF EOF
test_cmp expect actual && test_cmp expect actual &&
git -C "$upstream" show-ref >out && git -C "$upstream" show-ref >out &&
make_user_friendly_and_stable_output <out >actual && make_user_friendly_and_stable_output <out >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
<COMMIT-B> refs/heads/bar <COMMIT-A> refs/heads/bar
<COMMIT-A> refs/heads/baz
<COMMIT-A> refs/heads/foo
<COMMIT-B> refs/heads/main <COMMIT-B> refs/heads/main
<COMMIT-A> refs/heads/next <COMMIT-A> refs/heads/next
EOF EOF