[PATCH v9 3/5] t4205, t6006, t7102: make functions more readable
From: Alexey Shumkin <hidden>
Date: 2016-06-15 22:58:00
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH v9 3/5] t4205, t6006, t7102: make functions more readable · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH v9 3/5] t4205, t6006, t7102: make functions more readable · Alexey Shumkin <hidden>
- 2016-06-15 · Re: [PATCH v9 3/5] t4205, t6006, t7102: make functions more readable · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH v9 3/5] t4205, t6006, t7102: make functions more readable · Alexey Shumkin <hidden>
- 2016-06-15 · Re: [PATCH v9 3/5] t4205, t6006, t7102: make functions more readable · Junio C Hamano <hidden>
Function 'test_format' is become hard to read after its change in de6029a2d7734a93a9e27b9c4471862a47dd8123. So, make it more elegant. Also, change 'commit_msg' function to make it more pretty. Signed-off-by: Alexey Shumkin <redacted> Improved-by: Johannes Sixt [off-list ref] --- t/t4205-log-pretty-formats.sh | 5 +++-- t/t6006-rev-list-format.sh | 23 +++++------------------ t/t7102-reset.sh | 12 +++++++----- 3 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index ef9770a..bb87f02 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh@@ -7,8 +7,9 @@ test_description='Test pretty formats' . ./test-lib.sh -commit_msg () { - # String "initial. initial" partly in German (translated with Google Translate), +commit_msg() { + # 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..e069263 100755
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh@@ -35,26 +35,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..73a1bdb 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh@@ -9,15 +9,17 @@ Documented tests for git reset' . ./test-lib.sh -commit_msg () { - # String "modify 2nd file (changed)" partly in German(translated with Google Translate), +commit_msg() { + # 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)") + printf "modify 2nd file (ge\303\244ndert)" | if test -n "$1" then - msg=$(echo $msg | iconv -f utf-8 -t $1) + iconv -f utf-8 -t $1 + else + cat fi - echo $msg } test_expect_success 'creating initial files and commits' '
--
1.8.3.1.15.g5c23c1e