Michael Montalbo
47f79f6198
Replace bare grep with test_grep in test assertions across the
suite, including sourced test helpers (lib-*.sh, *-tests.sh).
test_grep prints the contents of the file being searched on
failure, making debugging easier than a bare grep which fails
silently.
Only assertion-style greps are converted: grep used as a filter
in pipelines, command substitutions, conditionals, or with
redirected I/O is left as-is with a "# lint-ok" annotation.
Existing '! test_grep' calls are rewritten to 'test_grep !' so
that the diagnostic output is preserved on failure.
test_grep requires the file it reads to exist, so '! grep'
assertions that inspect a file whose presence is conditional need
care. In t5537 the '.git/shallow' file is still present after the
repack (the client remains shallow), so the assertion is
converted like any other. In t1400 the '.git/packed-refs' file
exists only with the files backend, so its check is guarded with a
REFFILES prerequisite; the backend-agnostic 'git show-ref' check
that follows still runs under every backend. In t7450 'git~2' is
the NTFS 8.3 short name of a '..git' file and only exists
when 8.3 short-name generation is enabled, so its check is guarded
with a 'test -f' on the path and uses test_grep inside the guard,
the same shape as t1400 (a plain test_grep would BUG when the
short name is absent).
The conversion was generated using a grep-assertion linter
(greplint.pl, added in the following commit) to identify bare
grep calls at command position. To reproduce, from the t/
directory:
# Step 1: annotate the two data-filter greps (grep produces
# data, not a verdict) so the linter skips them.
sed -i '/grep -vf before commits\.raw/s/$/ # lint-ok: data filter/' \
t5326-multi-pack-bitmaps.sh
sed -i '/grep -E "^\[0-9a-f\].*|| :/s/$/ # lint-ok: data filter/' \
t5702-protocol-v2.sh
# Step 1b: two '! grep' assertions need more than a mechanical
# conversion; handle them by hand before the linter-driven steps
# below so it leaves them alone.
#
# t1400: '.git/packed-refs' is absent under reftable, so guard the
# check with REFFILES (a plain test_grep would BUG on the missing
# file):
#
# git update-ref -d HEAD $B &&
# - ! grep "$m" .git/packed-refs &&
# + if test_have_prereq REFFILES
# + then
# + test_grep ! "$m" .git/packed-refs
# + fi &&
# test_must_fail git show-ref --verify -q $m
#
# t7450: git~2 is an NTFS 8.3 short name that exists only when
# short-name generation is enabled, so guard the check on its
# presence with 'test -f' and note in a comment why the path can
# be absent (a plain test_grep would BUG when it is):
#
# - ! grep gitdir squatting-clone/d/a/git~2
# + if test -f squatting-clone/d/a/git~2
# + then
# + test_grep ! gitdir squatting-clone/d/a/git~2
# + fi
# Step 2: reorder pre-existing '! test_grep' to 'test_grep !'
# (must come before steps 3-4 so greplint does not see them)
sed -i 's/! test_grep/test_grep !/' t0031-lockfile-pid.sh
sed -i 's/! test_grep/test_grep !/' t5300-pack-object.sh
sed -i 's/! test_grep/test_grep !/' t5319-multi-pack-index.sh
# Step 3: convert '! grep' -> 'test_grep !'
perl greplint.pl *.sh 2>&1 | cut -d: -f1,2 |
while IFS=: read f l; do
sed -i "${l}s/! *grep/test_grep !/" "$f"
done
# Step 4: convert remaining 'grep' -> 'test_grep'
perl greplint.pl *.sh 2>&1 | cut -d: -f1,2 |
while IFS=: read f l; do
sed -i "${l}s/grep/test_grep/" "$f"
done
To verify, run: make -C t test-greplint
Signed-off-by: Michael Montalbo <mmontalbo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
304 lines
6.7 KiB
Bash
Executable File
304 lines
6.7 KiB
Bash
Executable File
#!/bin/sh
|
||
|
||
test_description='Test workflows involving pull request.'
|
||
|
||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||
|
||
. ./test-lib.sh
|
||
|
||
test_expect_success 'setup' '
|
||
|
||
git init --bare upstream.git &&
|
||
git init --bare downstream.git &&
|
||
git clone upstream.git upstream-private &&
|
||
git clone downstream.git local &&
|
||
|
||
trash_url="file://$TRASH_DIRECTORY" &&
|
||
downstream_url="$trash_url/downstream.git/" &&
|
||
upstream_url="$trash_url/upstream.git/" &&
|
||
|
||
(
|
||
cd upstream-private &&
|
||
cat <<-\EOT >mnemonic.txt &&
|
||
Thirtey days hath November,
|
||
Aprile, June, and September:
|
||
EOT
|
||
git add mnemonic.txt &&
|
||
test_tick &&
|
||
git commit -m "\"Thirty days\", a reminder of month lengths" &&
|
||
git tag -m "version 1" -a initial &&
|
||
git push --tags origin main
|
||
) &&
|
||
(
|
||
cd local &&
|
||
git remote add upstream "$trash_url/upstream.git" &&
|
||
git fetch upstream &&
|
||
git pull upstream main &&
|
||
cat <<-\EOT >>mnemonic.txt &&
|
||
Of twyecescore-eightt is but eine,
|
||
And all the remnante be thrycescore-eine.
|
||
O’course Leap yare comes an’pynes,
|
||
Ev’rie foure yares, gote it ryghth.
|
||
An’twyecescore-eight is but twyecescore-nyne.
|
||
EOT
|
||
git add mnemonic.txt &&
|
||
test_tick &&
|
||
git commit -m "More detail" &&
|
||
git tag -m "version 2" -a full &&
|
||
git checkout -b simplify HEAD^ &&
|
||
mv mnemonic.txt mnemonic.standard &&
|
||
cat <<-\EOT >mnemonic.clarified &&
|
||
Thirty days has September,
|
||
All the rest I can’t remember.
|
||
EOT
|
||
git add -N mnemonic.standard mnemonic.clarified &&
|
||
git commit -a -m "Adapt to use modern, simpler English
|
||
|
||
But keep the old version, too, in case some people prefer it." &&
|
||
git checkout main
|
||
)
|
||
|
||
'
|
||
|
||
test_expect_success 'setup: two scripts for reading pull requests' '
|
||
|
||
downstream_url_for_sed=$(
|
||
printf "%s\n" "$downstream_url" |
|
||
sed -e '\''s/\\/\\\\/g'\'' -e '\''s/[[/.*^$]/\\&/g'\''
|
||
) &&
|
||
|
||
cat <<-\EOT >read-request.sed &&
|
||
#!/bin/sed -nf
|
||
# Note that a request could ask for "tag $tagname"
|
||
/ in the Git repository at:$/!d
|
||
n
|
||
/^$/ n
|
||
s/ tag \([^ ]*\)$/ tag--\1/
|
||
s/^[ ]*\(.*\) \([^ ]*\)/please pull\
|
||
\1\
|
||
\2/p
|
||
q
|
||
EOT
|
||
|
||
cat <<-EOT >fuzz.sed
|
||
#!/bin/sed -nf
|
||
s/$downstream_url_for_sed/URL/g
|
||
s/$OID_REGEX/OBJECT_NAME/g
|
||
s/A U Thor/AUTHOR/g
|
||
s/[-0-9]\{10\} [:0-9]\{8\} [-+][0-9]\{4\}/DATE/g
|
||
s/ [^ ].*/ SUBJECT/g
|
||
s/ [^ ].* (DATE)/ SUBJECT (DATE)/g
|
||
s|tags/full|BRANCH|g
|
||
s/mnemonic.txt/FILENAME/g
|
||
s/^version [0-9]/VERSION/
|
||
/^ FILENAME | *[0-9]* [-+]*\$/ b diffstat
|
||
/^AUTHOR ([0-9]*):\$/ b shortlog
|
||
p
|
||
b
|
||
: diffstat
|
||
n
|
||
/ [0-9]* files* changed/ {
|
||
a\\
|
||
DIFFSTAT
|
||
b
|
||
}
|
||
b diffstat
|
||
: shortlog
|
||
/^ [a-zA-Z]/ n
|
||
/^[a-zA-Z]* ([0-9]*):\$/ n
|
||
/^\$/ N
|
||
/^\n[a-zA-Z]* ([0-9]*):\$/!{
|
||
a\\
|
||
SHORTLOG
|
||
D
|
||
}
|
||
n
|
||
b shortlog
|
||
EOT
|
||
|
||
'
|
||
|
||
test_expect_success 'pull request when forgot to push' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only main &&
|
||
test_must_fail git request-pull initial "$downstream_url" \
|
||
2>../err
|
||
) &&
|
||
test_grep "No match for commit .*" err &&
|
||
test_grep "Are you sure you pushed" err
|
||
|
||
'
|
||
|
||
test_expect_success 'pull request after push' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only main &&
|
||
git push origin main:for-upstream &&
|
||
git request-pull initial origin main:for-upstream >../request
|
||
) &&
|
||
sed -nf read-request.sed <request >digest &&
|
||
{
|
||
read task &&
|
||
read repository &&
|
||
read branch
|
||
} <digest &&
|
||
(
|
||
cd upstream-private &&
|
||
git checkout initial &&
|
||
git pull --ff-only "$repository" "$branch"
|
||
) &&
|
||
test "$branch" = for-upstream &&
|
||
test_cmp local/mnemonic.txt upstream-private/mnemonic.txt
|
||
|
||
'
|
||
|
||
test_expect_success 'request asks HEAD to be pulled' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only main &&
|
||
git push --tags origin main simplify &&
|
||
git push origin main:for-upstream &&
|
||
git request-pull initial "$downstream_url" >../request
|
||
) &&
|
||
sed -nf read-request.sed <request >digest &&
|
||
{
|
||
read task &&
|
||
read repository &&
|
||
read branch
|
||
} <digest &&
|
||
test -z "$branch"
|
||
|
||
'
|
||
|
||
test_expect_success 'pull request format' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
cat <<-\EOT >expect &&
|
||
The following changes since commit OBJECT_NAME:
|
||
|
||
SUBJECT (DATE)
|
||
|
||
are available in the Git repository at:
|
||
|
||
URL BRANCH
|
||
|
||
for you to fetch changes up to OBJECT_NAME:
|
||
|
||
SUBJECT (DATE)
|
||
|
||
----------------------------------------------------------------
|
||
VERSION
|
||
|
||
----------------------------------------------------------------
|
||
SHORTLOG
|
||
|
||
DIFFSTAT
|
||
EOT
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only main &&
|
||
git push origin tags/full &&
|
||
git request-pull initial "$downstream_url" tags/full >../request
|
||
) &&
|
||
<request sed -nf fuzz.sed >request.fuzzy &&
|
||
test_cmp expect request.fuzzy &&
|
||
|
||
(
|
||
cd local &&
|
||
git request-pull initial "$downstream_url" tags/full:refs/tags/full
|
||
) >request &&
|
||
sed -nf fuzz.sed <request >request.fuzzy &&
|
||
test_cmp expect request.fuzzy &&
|
||
|
||
(
|
||
cd local &&
|
||
git request-pull initial "$downstream_url" full
|
||
) >request &&
|
||
test_grep " tags/full\$" request
|
||
'
|
||
|
||
test_expect_success 'request-pull ignores OPTIONS_KEEPDASHDASH poison' '
|
||
|
||
(
|
||
cd local &&
|
||
OPTIONS_KEEPDASHDASH=Yes &&
|
||
export OPTIONS_KEEPDASHDASH &&
|
||
git checkout initial &&
|
||
git merge --ff-only main &&
|
||
git push origin main:for-upstream &&
|
||
git request-pull -- initial "$downstream_url" main:for-upstream >../request
|
||
)
|
||
|
||
'
|
||
|
||
test_expect_success 'request-pull quotes regex metacharacters properly' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only main &&
|
||
git tag -mrelease v2.0 &&
|
||
git push origin refs/tags/v2.0:refs/tags/v2-0 &&
|
||
test_must_fail git request-pull initial "$downstream_url" tags/v2.0 \
|
||
2>../err
|
||
) &&
|
||
test_grep "No match for commit .*" err &&
|
||
test_grep "Are you sure you pushed" err
|
||
|
||
'
|
||
|
||
test_expect_success 'pull request with mismatched object' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only main &&
|
||
git push origin HEAD:refs/tags/full &&
|
||
test_must_fail git request-pull initial "$downstream_url" tags/full \
|
||
2>../err
|
||
) &&
|
||
test_grep "points to a different object" err &&
|
||
test_grep "Are you sure you pushed" err
|
||
|
||
'
|
||
|
||
test_expect_success 'pull request with stale object' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only main &&
|
||
git push origin refs/tags/full &&
|
||
git tag -f -m"Thirty-one days" full &&
|
||
test_must_fail git request-pull initial "$downstream_url" tags/full \
|
||
2>../err
|
||
) &&
|
||
test_grep "points to a different object" err &&
|
||
test_grep "Are you sure you pushed" err
|
||
|
||
'
|
||
|
||
test_done
|