All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Jens Lehmann <Jens.Lehmann@web.de>
Cc: Junio C Hamano <gitster@pobox.com>,
	Git Mailing List <git@vger.kernel.org>, Jeff King <peff@peff.net>
Subject: [PATCH 6/7] t1303 (config): style tweaks
Date: Mon, 6 Sep 2010 20:53:18 -0500	[thread overview]
Message-ID: <20100907015317.GG1182@burratino> (raw)
In-Reply-To: <20100907014135.GA1182@burratino>

This test already has impeccable style, with one exception: there
is an unnecessary use of a subshell.  Use a {} block instead.
While at it:

 - guard setup commands with test_expect_success, so the commands
   are printed when the test is run with "-v" and errors in setup
   can be caught;
 - use echo instead of printf to print simple text ending with a
   newline, so the later use of printf stands out more;
 - put a single space before () in function definitions, for
   consistency with other shell scripts in git;
 - reorder arguments to test_cmp as "test_cmp expected actual".

Cc: Jeff King <peff@peff.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 t/t1303-wacky-config.sh |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/t/t1303-wacky-config.sh b/t/t1303-wacky-config.sh
index 080117c..ce7ce1c 100755
--- a/t/t1303-wacky-config.sh
+++ b/t/t1303-wacky-config.sh
@@ -3,16 +3,20 @@
 test_description='Test wacky input to git config'
 . ./test-lib.sh
 
-setup() {
-	(printf "[section]\n" &&
-	printf "  key = foo") >.git/config
-}
-
-check() {
-	echo "$2" >expected
-	git config --get "$1" >actual 2>&1
-	test_cmp actual expected
-}
+test_expect_success 'setup: helper functions' '
+	setup () {
+		{
+			echo "[section]" &&
+			printf "  key = foo"
+		} >.git/config
+	} &&
+
+	check () {
+		echo "$2" >expected
+		git config --get "$1" >actual 2>&1
+		test_cmp expected actual
+	}
+'
 
 test_expect_success 'modify same key' '
 	setup &&
@@ -34,14 +38,14 @@ test_expect_success 'add key in different section' '
 	check section2.key bar
 '
 
-SECTION="test.q\"s\\sq'sp e.key"
 test_expect_success 'make sure git config escapes section names properly' '
+	SECTION="test.q\"s\\sq'\''sp e.key" &&
 	git config "$SECTION" bar &&
 	check "$SECTION" bar
 '
 
-LONG_VALUE=$(printf "x%01021dx a" 7)
 test_expect_success 'do not crash on special long config line' '
+	LONG_VALUE=$(printf "x%01021dx a" 7) &&
 	setup &&
 	git config section.key "$LONG_VALUE" &&
 	check section.key "fatal: bad config file line 2 in .git/config"
-- 
1.7.2.3

  parent reply	other threads:[~2010-09-07  1:55 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-06 18:39 [PATCH] Several tests: cd inside subshell instead of around Jens Lehmann
2010-09-06 19:06 ` Jonathan Nieder
2010-09-06 20:12   ` Jens Lehmann
2010-09-07  1:41     ` [PATCH 0/7] " Jonathan Nieder
2010-09-07  1:42       ` [PATCH 1/7] tests: subshell indentation stylefix Jonathan Nieder
2010-09-07  3:44         ` Jonathan Nieder
2010-09-07  1:47       ` [PATCH 2/7] t1450 (fsck): remove dangling objects Jonathan Nieder
2010-09-07  1:49       ` [PATCH 3/7] t2105 (gitfile): add missing && Jonathan Nieder
2010-09-07 12:57         ` Brad King
2010-09-07  1:50       ` [PATCH 4/7] t0004 (unwritable files): simplify error handling Jonathan Nieder
2010-09-07  1:52       ` [PATCH 5/7] t1302 (core.repositoryversion): style tweaks Jonathan Nieder
2010-09-07 23:45         ` Nguyen Thai Ngoc Duy
2010-09-07  1:53       ` Jonathan Nieder [this message]
2010-09-07  4:30         ` [PATCH 6/7] t1303 (config): " Jeff King
2010-09-07  4:52           ` Junio C Hamano
2010-09-07  5:27             ` Jonathan Nieder
2010-09-07  5:12           ` guarding everything with test_expect_success (Re: [PATCH 6/7] t1303 (config): style tweaks) Jonathan Nieder
2010-09-07  5:56             ` Jeff King
2010-09-07  6:12               ` Jonathan Nieder
2010-09-07  1:55       ` [PATCH/RFC 7/7] t2016 (checkout -p): use printf for multiline y/n input Jonathan Nieder
2010-09-07  8:06         ` Thomas Rast
2010-09-07  8:22           ` Jonathan Nieder
2010-09-06 23:16 ` [PATCH] Several tests: cd inside subshell instead of around Junio C Hamano
2010-09-07  2:37   ` Jonathan Nieder
2010-09-07  5:08     ` Junio C Hamano
2010-09-07  5:19       ` Jonathan Nieder
2010-09-07 10:29   ` [PATCH] t1020: Get rid of 'cd "$HERE"' at the start of each test Jens Lehmann

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=20100907015317.GG1182@burratino \
    --to=jrnieder@gmail.com \
    --cc=Jens.Lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.