[PATCH v2 0/8] t: replace incorrect test_must_fail usage (part 3)
- From
Denton Liu <liu.denton@gmail.com>
- Date
- Mar 26, 2020, 08:27 UTC
- Message-ID
- <cover.1585209554.git.liu.denton@gmail.com>
- In-Reply-To
- <cover.1585115341.git.liu.denton@gmail.com>
The overall scope of these patches is to replace inappropriate uses of test_must_fail. IOW, we should only allow test_must_fail to run on `git` and `test-tool`. Ultimately, we will conclude by making test_must_fail error out on non-git commands. An advance view of the final series can be found here[1].
This is the third part. It focuses on t5*.sh.
The first part can be found here[2]. The second part can be found here[3].
Changes since v1:
* Broke up long generate_references() lines for clarity in 2/8
* For-loop &&-chain and renamed variable to "ref" in 2/8
* Cleaned up commit message in 2/8
* Rewrote 4/8 with a simpler test case
[1]: (may be rebased at any time) https://github.com/Denton-L/git/tree/ready/cleanup-test-must-fail2 [2]: https://lore.kernel.org/git/cover.1576583819.git.liu.denton@gmail.com/ [3]: https://lore.kernel.org/git/cover.1577454401.git.liu.denton@gmail.com/
Denton Liu (8): t5512: don't use `test_must_fail test_cmp` t5512: stop losing git exit code in here-docs t5512: stop losing return codes of git commands t5550: simplify no matching line check t5607: reorder `nongit test_must_fail` t5612: don't use `test_must_fail test_cmp` t5612: stop losing return codes of git commands t5801: teach compare_refs() to accept !
t/t5512-ls-remote.sh | 80 ++++++++++++++++++++------------------ t/t5550-http-fetch-dumb.sh | 4 +- t/t5607-clone-bundle.sh | 2 +- t/t5612-clone-refspec.sh | 26 ++++++------- t/t5801-remote-helpers.sh | 10 ++++- 5 files changed, 66 insertions(+), 56 deletions(-)
Range-diff against v1:
1: 3d7dc8428d = 1: 3d7dc8428d t5512: don't use `test_must_fail test_cmp`
2: 674de50db2 ! 2: 97bc46e4a9 t5512: generate references with generate_references()
@@ Metadata
Author: Denton Liu <liu.denton@gmail.com>
## Commit message ##
- t5512: generate references with generate_references()
+ t5512: stop losing git exit code in here-docs
The expected references are generated using a here-doc with some inline
- subshells. If one of the `git rev-parse` invocations within the
- subshells failed, its return code is swallowed and we won't know about
- it. Replace these here-docs with generate_references(), which actually
- reports when `git rev-parse` fails.
+ command substitutions. If one of the `git rev-parse` invocations within
+ the command substitutions fails, its return code is swallowed and we
+ won't know about it. Replace these command substitutions with
+ generate_references(), which actually reports when `git rev-parse`
+ fails.
## t/t5512-ls-remote.sh ##
@@ t/t5512-ls-remote.sh: test_description='git ls-remote'
@@ t/t5512-ls-remote.sh: test_description='git ls-remote'
. ./test-lib.sh
+generate_references () {
-+ for i
++ for ref
+ do
-+ oid=$(git rev-parse "$i") || return 1
-+ printf '%s\t%s\n' "$oid" "$i"
++ oid=$(git rev-parse "$ref") &&
++ printf '%s\t%s\n' "$oid" "$ref" || return 1
+ done
+}
+
@@ t/t5512-ls-remote.sh: test_expect_success 'ls-remote self' '
- $(git rev-parse mark1.2) refs/tags/mark1.2
- $(git rev-parse mark1.10) refs/tags/mark1.10
- EOF
-+ generate_references refs/tags/mark refs/tags/mark1.1 refs/tags/mark1.2 refs/tags/mark1.10 >expect &&
++ generate_references \
++ refs/tags/mark \
++ refs/tags/mark1.1 \
++ refs/tags/mark1.2 \
++ refs/tags/mark1.10 >expect &&
git ls-remote --sort="version:refname" --tags self >actual &&
test_cmp expect actual
'
@@ t/t5512-ls-remote.sh: test_expect_success 'ls-remote self' '
- $(git rev-parse mark1.1) refs/tags/mark1.1
- $(git rev-parse mark) refs/tags/mark
- EOF
-+ generate_references refs/tags/mark1.10 refs/tags/mark1.2 refs/tags/mark1.1 refs/tags/mark >expect &&
++ generate_references \
++ refs/tags/mark1.10 \
++ refs/tags/mark1.2 \
++ refs/tags/mark1.1 \
++ refs/tags/mark >expect &&
git ls-remote --sort="-version:refname" --tags self >actual &&
test_cmp expect actual
'
@@ t/t5512-ls-remote.sh: test_expect_success 'ls-remote self' '
- $(git rev-parse mark1.1) refs/tags/mark1.1
- $(git rev-parse mark) refs/tags/mark
- EOF
-+ generate_references refs/tags/mark1.2 refs/tags/mark1.10 refs/tags/mark1.1 refs/tags/mark >expect &&
++ generate_references \
++ refs/tags/mark1.2 \
++ refs/tags/mark1.10 \
++ refs/tags/mark1.1 \
++ refs/tags/mark >expect &&
git ls-remote --sort="-refname" --tags self >actual &&
test_cmp expect actual
'
@@ t/t5512-ls-remote.sh: test_expect_success 'protocol v2 supports hiderefs' '
- $(git rev-parse refs/tags/mark1.2) refs/tags/mark1.2
- EOF
+ echo "ref: refs/heads/master HEAD" >expect &&
-+ generate_references HEAD \
++ generate_references \
++ HEAD \
+ refs/heads/master >>expect &&
+ oid=$(git rev-parse HEAD) &&
+ echo "$oid refs/remotes/origin/HEAD" >>expect &&
-+ generate_references refs/remotes/origin/master \
++ generate_references \
++ refs/remotes/origin/master \
+ refs/tags/mark \
+ refs/tags/mark1.1 \
+ refs/tags/mark1.10 \
3: b3addeb985 = 3: 986ba1dd39 t5512: stop losing return codes of git commands
4: 68c911e29b < -: ---------- t5550: remove use of `test_might_fail grep`
-: ---------- > 4: 53e64e7077 t5550: simplify no matching line check
5: 4253f51fea = 5: 4955b701e1 t5607: reorder `nongit test_must_fail`
6: 2bac5f4a29 = 6: a3d9d3673b t5612: don't use `test_must_fail test_cmp`
7: b490ccace0 = 7: bc0e90d5ba t5612: stop losing return codes of git commands
8: b51f97f6ae = 8: 6a9d3cef2a t5801: teach compare_refs() to accept !-- 2.26.0.159.g23e2136ad0