From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Steffen Daode Nurpmeso" <sdaoden@googlemail.com>,
"Ingo Brückl" <ib@wupperonline.de>
Subject: [PATCH 02/10] test-lib: add helper functions for config
Date: Wed, 17 Aug 2011 22:01:15 -0700 [thread overview]
Message-ID: <20110818050114.GB2889@sigill.intra.peff.net> (raw)
In-Reply-To: <20110818045821.GA17377@sigill.intra.peff.net>
There are a few common tasks when working with configuration
variables in tests; this patch aims to make them a little
easier to write and less error-prone.
When setting a variable, you should typically make sure to
clean it up after the test is finished, so as not to pollute
other tests. Like:
test_when_finished 'git config --unset foo.bar' &&
git config foo.bar baz
This patch lets you just write:
test_config foo.bar baz
When clearing a variable that does not exist, git-config
will report a specific non-zero error code. Meaning that
tests which call "git config --unset" often either rely on
the prior tests having actually set it, or must use
test_might_fail. With this patch, the previous:
test_might_fail git config --unset foo.bar
becomes:
test_unconfig foo.bar
Not only is this easier to type, but it is more robust; it
will correctly detect errors from git-config besides "key
was not set".
Signed-off-by: Jeff King <peff@peff.net>
---
t/test-lib.sh | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index df25f17..926667a 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -357,6 +357,24 @@ test_chmod () {
git update-index --add "--chmod=$@"
}
+# Unset a configuration variable, but don't fail if it doesn't exist.
+test_unconfig () {
+ git config --unset-all "$@"
+ config_status=$?
+ case "$config_status" in
+ 5) # ok, nothing to usnet
+ config_status=0
+ ;;
+ esac
+ return $config_status
+}
+
+# Set git config, automatically unsetting it after the test is over.
+test_config () {
+ test_when_finished "test_unconfig '$1'" &&
+ git config "$@"
+}
+
# Use test_set_prereq to tell that a particular prerequisite is available.
# The prerequisite can later be checked for in two ways:
#
--
1.7.6.10.g62f04
next prev parent reply other threads:[~2011-08-18 5:01 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-18 4:58 [PATCH 0/10] color and pager improvements Jeff King
2011-08-18 5:00 ` [PATCH 01/10] t7006: modernize calls to unset Jeff King
2011-08-18 21:05 ` Junio C Hamano
2011-08-18 5:01 ` Jeff King [this message]
2011-08-18 21:10 ` [PATCH 02/10] test-lib: add helper functions for config Junio C Hamano
2011-08-18 5:02 ` [PATCH 03/10] t7006: use test_config helpers Jeff King
2011-08-18 5:02 ` [PATCH 04/10] setup_pager: set GIT_PAGER_IN_USE Jeff King
2011-08-18 5:03 ` [PATCH 05/10] diff: refactor COLOR_DIFF from a flag into an int Jeff King
2011-08-18 5:03 ` [PATCH 06/10] git_config_colorbool: refactor stdout_is_tty handling Jeff King
2011-08-18 5:04 ` [PATCH 07/10] color: delay auto-color decision until point of use Jeff King
2011-08-18 21:59 ` Junio C Hamano
2011-08-18 22:28 ` Jeff King
2011-08-18 5:04 ` [PATCH 08/10] config: refactor get_colorbool function Jeff King
2011-08-18 5:05 ` [PATCH 09/10] diff: don't load color config in plumbing Jeff King
2011-08-18 5:05 ` [PATCH 10/10] want_color: automatically fallback to color.ui Jeff King
2011-09-04 2:36 ` Martin von Zweigbergk
2011-09-04 12:53 ` Jeff King
2011-09-05 11:31 ` Steffen Daode Nurpmeso
2011-08-18 21:58 ` [PATCH 0/10] color and pager improvements Jeff King
2011-08-18 21:59 ` [PATCH 11/10] support pager.* for aliases Jeff King
2011-08-18 22:54 ` Junio C Hamano
2011-08-19 3:37 ` Jeff King
2011-08-19 4:18 ` Junio C Hamano
2011-08-19 4:40 ` Jeff King
2011-08-19 5:23 ` Junio C Hamano
2011-08-19 5:43 ` Junio C Hamano
2011-08-19 8:30 ` Jeff King
2011-08-18 22:01 ` [PATCH 12/10] support pager.* for external commands Jeff King
2011-08-18 22:56 ` Junio C Hamano
2012-02-12 0:46 ` Ævar Arnfjörð Bjarmason
2012-02-14 19:13 ` Jeff King
2011-08-18 22:33 ` [PATCH 0/10] color and pager improvements Ingo Brückl
2011-08-18 22:46 ` Jeff King
2011-08-19 6:34 ` Ingo Brückl
2011-08-25 20:25 ` Jeff King
2011-08-18 21:59 ` Steffen Daode Nurpmeso
2011-08-18 22:02 ` 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=20110818050114.GB2889@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ib@wupperonline.de \
--cc=sdaoden@googlemail.com \
/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 NNTP newsgroup(s).