[PATCH v6 00/11] test-lib.sh: new test_commit args, simplification & fixes
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- May 10, 2021, 14:18 UTC
- Message-ID
- <cover-00.11-00000000000-20210510T141055Z-avarab@gmail.com>
- In-Reply-To
- <cover-00.11-00000000000-20210423T072006Z-avarab@gmail.com>
Changes since v5 only trivial commit message / comment fixes suggested by Đoàn Trần Công Danh. Thanks! Link to v5: http://lore.kernel.org/git/cover-00.11-00000000000-20210423T072006Z-avarab@gmail.com
Ævar Arnfjörð Bjarmason (11): test-lib: bring $remove_trash out of retirement test-lib tests: remove dead GIT_TEST_FRAMEWORK_SELFTEST variable test-lib-functions: reword "test_commit --append" docs test-lib-functions: document test_commit --no-tag test-lib functions: add an --annotated option to "test_commit" describe tests: convert setup to use test_commit test-lib functions: add --printf option to test_commit submodule tests: use symbolic-ref --short to discover branch name test-lib: reformat argument list in test_create_repo() test-lib: do not show advice about init.defaultBranch under --verbose test-lib: split up and deprecate test_create_repo()
t/lib-submodule-update.sh | 3 +- t/t0000-basic.sh | 4 -- t/t1307-config-blob.sh | 4 +- t/t1403-show-ref.sh | 6 +-- t/t2030-unresolve-info.sh | 3 +- t/t4006-diff-mode.sh | 6 +-- t/t4030-diff-textconv.sh | 8 +--- t/t5406-remote-rejects.sh | 1 - t/t5407-post-rewrite-hook.sh | 2 - t/t5409-colorize-remote-messages.sh | 1 - t/t5520-pull.sh | 10 +---- t/t6120-describe.sh | 58 ++++++--------------------- t/test-lib-functions.sh | 62 ++++++++++++++++++----------- t/test-lib.sh | 40 ++++++++++++------- 14 files changed, 89 insertions(+), 119 deletions(-)
Range-diff against v5:
1: 75667f98f3a ! 1: febf98e87a1 test-lib: bring $remove_trash out of retirement
@@ Commit message
case.
We carry around the "$remove_trash" variable because if the directory
- is unexpectedly gone at test_done time we'll hit the error about it
- being unexpectedly gone added in df4c0d1a792 (test-lib: abort when
- can't remove trash directory, 2017-04-20).
+ is unexpectedly gone at test_done time we'll still want to hit the
+ "trash directory already removed" error, but not if we never created
+ the trash directory. See df4c0d1a792 (test-lib: abort when can't
+ remove trash directory, 2017-04-20) for the addition of that error.
So let's partially revert 06478dab4c (test-lib: retire $remove_trash
variable, 2017-04-23) and move the decision about whether to skip all
@@ Commit message
under --debug at the end of the test, 2017-04-24) for a bug we don't
want to re-introduce.
- While I'm at it let's move the HOME assignment to just before
+ While I'm at it, let's move the HOME assignment to just before
test_create_repo, it could be lower, but it seems better to set it
before calling anything in test-lib-functions.sh
2: 55c9413f9cd = 2: 6f360e37e84 test-lib tests: remove dead GIT_TEST_FRAMEWORK_SELFTEST variable
3: 361e34654e9 = 3: c2a0140fcd9 test-lib-functions: reword "test_commit --append" docs
4: 2db68a4ac7c = 4: 1a675a6cfe5 test-lib-functions: document test_commit --no-tag
5: 4ceba3d404b = 5: 2e0d69209e9 test-lib functions: add an --annotated option to "test_commit"
6: 589eaf7a078 ! 6: 07e8b63596b describe tests: convert setup to use test_commit
@@ Commit message
describe tests: convert setup to use test_commit
Convert the setup of the describe tests to use test_commit when
- possible. This makes use of the new --annotated-tag option to
- test_commit.
+ possible. This makes use of the new --annotate option to test_commit.
Some of the setup here could simply be removed since the data being
created wasn't important to any of the subsequent tests, so I've done
7: a0fe0640148 ! 7: 5aaeadf01ff test-lib functions: add --printf option to test_commit
@@ t/test-lib-functions.sh: debug () {
# Use ">>" instead of ">" when writing "<contents>" to "<file>"
+# --printf
+# Use "printf" instead of "echo" when writing "<contents>" to
-+# "<file>". You will need to provide your own trailing "\n". You
-+# can only supply the FORMAT for the printf(1), not its ARGUMENT(s).
++# "<file>", use this to write escape sequences such as "\0", a
++# trailing "\n" won't be added automatically. This option
++# supports nothing but the FORMAT of printf(1), i.e. no custom
++# ARGUMENT(s).
# --signoff
# Invoke "git commit" with --signoff
# --author <author>
8: 7fb8849ce66 = 8: 0b31b1ffeff submodule tests: use symbolic-ref --short to discover branch name
9: f67245ba40d = 9: c806f3888c5 test-lib: reformat argument list in test_create_repo()
10: 37338c88300 = 10: 105a95fb7a0 test-lib: do not show advice about init.defaultBranch under --verbose
11: 7793311e5f1 = 11: 217c5aed491 test-lib: split up and deprecate test_create_repo()-- 2.31.1.838.g924d365b763