From: James Liu <james@jamesliu.io>
To: git@vger.kernel.org
Cc: James Liu <james@jamesliu.io>
Subject: [PATCH 1/2] advice: allow advice type to be provided in tests
Date: Wed, 24 Apr 2024 13:58:56 +1000 [thread overview]
Message-ID: <20240424035857.84583-2-james@jamesliu.io> (raw)
In-Reply-To: <20240424035857.84583-1-james@jamesliu.io>
advise_if_enabled() has a special branch to handle
backwards-compatibility with the `pushUpdateRejected` and
`pushNonFastForward` advice types, which went untested.
Modify the `test-tool advise` command so the advice type can be changed
between nestedTag (the previous behaviour) and pushUpdateRejected.
Signed-off-by: James Liu <james@jamesliu.io>
---
t/helper/test-advise.c | 20 ++++++++++++++------
t/t0018-advice.sh | 30 +++++++++++++++++++++++++++---
2 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/t/helper/test-advise.c b/t/helper/test-advise.c
index 8a3fd0009a..c18b18e059 100644
--- a/t/helper/test-advise.c
+++ b/t/helper/test-advise.c
@@ -5,18 +5,26 @@
int cmd__advise_if_enabled(int argc, const char **argv)
{
- if (argc != 2)
- die("usage: %s <advice>", argv[0]);
+ if (argc != 3)
+ die("usage: %s nestedTag|pushUpdateRejected <advice>", argv[0]);
setup_git_directory();
git_config(git_default_config, NULL);
/*
- * Any advice type can be used for testing, but NESTED_TAG was
- * selected here and in t0018 where this command is being
- * executed.
+ * Any advice type can be used for testing, but ADVICE_NESTED_TAG and
+ * ADVICE_PUSH_UPDATE_REJECTED were selected here and used in t0018
+ * where this command is being executed.
+ *
+ * This allows test cases to exercise the normal and special branch
+ * within advice_enabled().
*/
- advise_if_enabled(ADVICE_NESTED_TAG, "%s", argv[1]);
+ if (!strcmp(argv[1], "nestedTag"))
+ advise_if_enabled(ADVICE_NESTED_TAG, "%s", argv[2]);
+ else if (!strcmp(argv[1], "pushUpdateRejected"))
+ advise_if_enabled(ADVICE_PUSH_UPDATE_REJECTED, "%s", argv[2]);
+ else
+ die("advice type should be nestedTag|pushUpdateRejected");
return 0;
}
diff --git a/t/t0018-advice.sh b/t/t0018-advice.sh
index 0dcfb760a2..8010796e1f 100755
--- a/t/t0018-advice.sh
+++ b/t/t0018-advice.sh
@@ -10,7 +10,16 @@ test_expect_success 'advice should be printed when config variable is unset' '
hint: This is a piece of advice
hint: Disable this message with "git config advice.nestedTag false"
EOF
- test-tool advise "This is a piece of advice" 2>actual &&
+ test-tool advise nestedTag "This is a piece of advice" 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'advice should be printed when advice.pushUpdateRejected and its alias are unset' '
+ cat >expect <<-\EOF &&
+ hint: This is a piece of advice
+ hint: Disable this message with "git config advice.pushUpdateRejected false"
+ EOF
+ test-tool advise pushUpdateRejected "This is a piece of advice" 2>actual &&
test_cmp expect actual
'
@@ -19,14 +28,29 @@ test_expect_success 'advice should be printed when config variable is set to tru
hint: This is a piece of advice
EOF
test_config advice.nestedTag true &&
- test-tool advise "This is a piece of advice" 2>actual &&
+ test-tool advise nestedTag "This is a piece of advice" 2>actual &&
test_cmp expect actual
'
test_expect_success 'advice should not be printed when config variable is set to false' '
test_config advice.nestedTag false &&
- test-tool advise "This is a piece of advice" 2>actual &&
+ test-tool advise nestedTag "This is a piece of advice" 2>actual &&
test_must_be_empty actual
'
+test_expect_success 'advice should not be printed when advice.pushUpdateRejected is unset but its alias is set to false' '
+ test_config advice.pushNonFastForward false &&
+ test-tool advise pushUpdateRejected "This is a piece of advice" 2>actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success 'advice should be printed when advice.pushUpdateRejected is set to true and its alias is unset' '
+ cat >expect <<-\EOF &&
+ hint: This is a piece of advice
+ EOF
+ test_config advice.pushUpdateRejected true &&
+ test-tool advise pushUpdateRejected "This is a piece of advice" 2>actual &&
+ test_cmp expect actual
+'
+
test_done
--
2.44.0
next prev parent reply other threads:[~2024-04-24 3:59 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 3:58 [PATCH 0/2] advice: add "all" option to disable all hints James Liu
2024-04-24 3:58 ` James Liu [this message]
2024-04-24 5:28 ` [PATCH 1/2] advice: allow advice type to be provided in tests Patrick Steinhardt
2024-04-24 3:58 ` [PATCH 2/2] advice: add "all" option to disable all hints James Liu
2024-04-24 5:29 ` Patrick Steinhardt
2024-04-24 6:28 ` [PATCH 0/2] " Junio C Hamano
2024-04-24 6:48 ` Patrick Steinhardt
2024-04-24 13:52 ` Phillip Wood
2024-04-24 14:07 ` Patrick Steinhardt
2024-04-24 14:59 ` Junio C Hamano
2024-04-25 6:46 ` Patrick Steinhardt
2024-04-25 16:18 ` Junio C Hamano
2024-04-24 16:14 ` Dragan Simic
2024-04-24 16:21 ` Dragan Simic
2024-04-24 14:31 ` Junio C Hamano
2024-04-25 6:42 ` Patrick Steinhardt
2024-04-24 7:37 ` Dragan Simic
2024-04-29 1:09 ` [PATCH v2 0/1] advice: add --no-advice global option James Liu
2024-04-29 1:09 ` [PATCH v2 1/1] " James Liu
2024-04-29 4:15 ` Dragan Simic
2024-04-29 5:01 ` James Liu
2024-04-29 5:36 ` Dragan Simic
2024-04-29 5:59 ` Dragan Simic
2024-04-29 6:04 ` Eric Sunshine
2024-04-29 6:12 ` Dragan Simic
2024-04-29 6:40 ` Jeff King
2024-04-29 6:55 ` Dragan Simic
2024-04-29 13:50 ` Junio C Hamano
2024-04-30 0:56 ` James Liu
2024-04-29 13:48 ` Junio C Hamano
2024-04-29 17:05 ` Rubén Justo
2024-04-29 17:54 ` Dragan Simic
2024-04-30 1:47 ` [PATCH v3 0/1] " James Liu
2024-04-30 1:47 ` [PATCH v3 1/1] " James Liu
2024-04-30 5:18 ` Patrick Steinhardt
2024-04-30 6:24 ` Dragan Simic
2024-04-30 16:29 ` Junio C Hamano
2024-05-03 7:17 ` [PATCH v4 0/3] advice: add "all" option to disable all hints James Liu
2024-05-03 7:17 ` [PATCH v4 1/3] doc: clean up usage documentation for --no-* opts James Liu
2024-05-03 17:30 ` Junio C Hamano
2024-05-06 1:39 ` James Liu
2024-05-03 7:17 ` [PATCH v4 2/3] doc: add spacing around paginate options James Liu
2024-05-03 14:32 ` Karthik Nayak
2024-05-03 17:36 ` Junio C Hamano
2024-05-03 7:17 ` [PATCH v4 3/3] advice: add --no-advice global option James Liu
2024-05-08 0:40 ` [PATCH v4 4/3] t0018: two small fixes Junio C Hamano
2024-05-03 7:31 ` [PATCH v4 0/3] advice: add "all" option to disable all hints Dragan Simic
2024-05-03 18:00 ` Re* " Junio C Hamano
2024-05-03 19:26 ` Eric Sunshine
2024-05-03 19:48 ` Junio C Hamano
2024-05-03 20:08 ` Junio C Hamano
2024-05-03 21:24 ` Eric Sunshine
2024-05-05 11:03 ` Johannes Schindelin
2024-05-06 16:40 ` Re* " Junio C Hamano
2024-05-07 0:11 ` Dragan Simic
2024-05-07 0:21 ` Junio C Hamano
2024-05-07 4:45 ` Dragan Simic
2024-05-07 0:01 ` Dragan Simic
2024-05-03 14:35 ` Karthik Nayak
2024-05-05 23:17 ` James Liu
2024-05-03 17:25 ` Junio C Hamano
2024-05-05 23:20 ` James Liu
2024-05-06 1:10 ` James Liu
2024-05-06 16:47 ` Junio C Hamano
2024-05-06 23:08 ` James Liu
2024-05-07 6:23 ` Karthik Nayak
2024-05-06 16:41 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240424035857.84583-2-james@jamesliu.io \
--to=james@jamesliu.io \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).