Function 'test_format' has become harder to read after its
change in de6029a2 (pretty: Add failing tests: --format output
should honor logOutputEncoding, 2013-06-26). Simplify it by
moving its should we expect it to fail? parameter to the end.
Note, current code does not use this last parameter as far as there
are no tests expected to fail. We can keep that for future use.
Also, reformat comments
Signed-off-by: Alexey Shumkin alex.crez...@gmail.com
Improved-by: Johannes Sixt j.s...@viscovery.net
---
t/t4205-log-pretty-formats.sh | 3 ++-
t/t6006-rev-list-format.sh| 28
t/t7102-reset.sh | 10 ++
3 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index ef9770a..2933c63 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -8,7 +8,8 @@ test_description='Test pretty formats'
. ./test-lib.sh
commit_msg () {
- # String initial. initial partly in German (translated with Google
Translate),
+ # String initial. initial partly in German
+ # (translated with Google Translate),
# encoded in UTF-8, used as a commit log message below.
msg=$(printf initial. anf\303\244nglich)
if test -n $1
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index 4751d22..b32405a 100755
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -9,8 +9,9 @@ test_description='git rev-list --pretty=format test'
. $TEST_DIRECTORY/lib-terminal.sh
test_tick
-# String added in German (translated with Google Translate), encoded in
UTF-8,
-# used as a commit log message below.
+# String added in German
+# (translated with Google Translate),
+# encoded in UTF-8, used as a commit log message below.
added=$(printf added (hinzugef\303\274gt) foo)
added_iso88591=$(echo $added | iconv -f utf-8 -t iso8859-1)
# same but changed
@@ -35,26 +36,13 @@ test_expect_success 'setup' '
git config --unset i18n.commitEncoding
'
-# usage: test_format [failure] name format_string expected_output
+# usage: test_format name format_string [failure] expected_output
test_format () {
- must_fail=0
- # if parameters count is more than 2 then test must fail
- if test $# -gt 2
- then
- must_fail=1
- # remove first parameter which is flag for test failure
- shift
- fi
cat expect.$1
- name=format $1
- command=git rev-list --pretty=format:'$2' master output.$1
- test_cmp expect.$1 output.$1
- if test $must_fail -eq 1
- then
- test_expect_failure $name $command
- else
- test_expect_success $name $command
- fi
+ test_expect_${3:-success} format $1
+ git rev-list --pretty=format:'$2' master output.$1
+ test_cmp expect.$1 output.$1
+
}
# Feed to --format to provide predictable colored sequences.
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 2ef96e9..535e609 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -10,14 +10,16 @@ Documented tests for git reset'
. ./test-lib.sh
commit_msg () {
- # String modify 2nd file (changed) partly in German(translated with
Google Translate),
+ # String modify 2nd file (changed) partly in German
+ # (translated with Google Translate),
# encoded in UTF-8, used as a commit log message below.
- msg=$(printf modify 2nd file (ge\303\244ndert))
+ msg=modify 2nd file (ge\303\244ndert)
if test -n $1
then
- msg=$(echo $msg | iconv -f utf-8 -t $1)
+ print $msg | iconv -f utf-8 -t $1
+ else
+ print $msg
fi
- echo $msg
}
test_expect_success 'creating initial files and commits' '
--
1.8.3.2.16.gb1f0d63
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
