From: Johannes Sixt <j6t@kdbg.org>
To: "Stephen P . Smith" <ischis2@cox.net>
Cc: git@vger.kernel.org,
"Linus Torvalds" <torvalds@linux-foundation.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH 3/3] t0006-date.sh: add `human` date format tests.
Date: Tue, 8 Jan 2019 22:27:22 +0100 [thread overview]
Message-ID: <a8a586d9-dad7-606f-948c-06725ac3e062@kdbg.org> (raw)
In-Reply-To: <20181231003150.8031-4-ischis2@cox.net>
Am 31.12.18 um 01:31 schrieb Stephen P. Smith:
> +check_human_date () {
> + time=$1
> + expect=$2
> + test_expect_success "check date ($format:$time)" '
> + echo "$time -> $expect" >expect &&
> + TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
> + grep "$expect" actual
> + '
> +}
> +
> # arbitrary but sensible time for examples
> TIME='1466000000 +0200'
> check_show iso8601 "$TIME" '2016-06-15 16:13:20 +0200'
> @@ -52,6 +62,20 @@ check_show unix "$TIME" '1466000000'
> check_show iso-local "$TIME" '2016-06-15 14:13:20 +0000'
> check_show raw-local "$TIME" '1466000000 +0000'
> check_show unix-local "$TIME" '1466000000'
> +check_show human "$TIME" 'Jun 15 2016'
> +
> +# Subtract some known constant time and look for expected field format
> +TODAY_REGEX='5 hours ago'
> +THIS_YEAR_REGEX='[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]* [012][0-9]:[0-6][0-9]'
> +MORE_THAN_A_YEAR_REGEX='[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]* [0-9][0-9][0-9][0-9]'
> +check_human_date "$(($(date +%s)-18000)) +0200" $TODAY_REGEX # 5 hours ago
> +check_human_date "$(($(date +%s)-432000)) +0200" $THIS_YEAR_REGEX # 5 days ago
> +check_human_date "$(($(date +%s)-1728000)) +0200" $THIS_YEAR_REGEX # 3 weeks ago
> +check_human_date "$(($(date +%s)-13000000)) +0200" $THIS_YEAR_REGEX # 5 months ago
> +check_human_date "$(($(date +%s)-31449600)) +0200" $THIS_YEAR_REGEX # 12 months ago
> +check_human_date "$(($(date +%s)-37500000)) +0200" $MORE_THAN_A_YEAR_REGEX # 1 year, 2 months ago
> +check_human_date "$(($(date +%s)-55188000)) +0200" $MORE_THAN_A_YEAR_REGEX # 1 year, 9 months ago
> +check_human_date "$(($(date +%s)-630000000)) +0200" $MORE_THAN_A_YEAR_REGEX # 20 years ago
>
> check_show 'format:%z' "$TIME" '+0200'
> check_show 'format-local:%z' "$TIME" '+0000'
> diff --git a/t/t4202-log.sh b/t/t4202-log.sh
> index 819c24d10e..d7f3b73650 100755
> --- a/t/t4202-log.sh
> +++ b/t/t4202-log.sh
> @@ -1707,4 +1707,28 @@ test_expect_success '--exclude-promisor-objects does not BUG-crash' '
> test_must_fail git log --exclude-promisor-objects source-a
> '
>
> +check_human_date() {
> + commit_date=$1
> + expect=$2
> + test_expect_success "$commit_date" "
> + echo $expect $commit_date >dates &&
> + git add dates &&
> + git commit -m 'Expect String' --date=\"$commit_date\" dates &&
> + git log -1 --date=human | grep \"^Date:\" >actual &&
> + grep \"$expect\" actual
> +"
> +}
> +
> +TODAY_REGEX='[A-Z][a-z][a-z] [012][0-9]:[0-6][0-9] .0200'
> +THIS_YEAR_REGEX='[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]* [012][0-9]:[0-6][0-9]'
> +MORE_THAN_A_YEAR_REGEX='[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]* [0-9][0-9][0-9][0-9]'
> +check_human_date "$(($(date +%s)-18000)) +0200" $TODAY_REGEX # 5 hours ago
> +check_human_date "$(($(date +%s)-432000)) +0200" $THIS_YEAR_REGEX # 5 days ago
> +check_human_date "$(($(date +%s)-1728000)) +0200" $THIS_YEAR_REGEX # 3 weeks ago
> +check_human_date "$(($(date +%s)-13000000)) +0200" $THIS_YEAR_REGEX # 5 months ago
> +check_human_date "$(($(date +%s)-31449600)) +0200" $THIS_YEAR_REGEX # 12 months ago
> +check_human_date "$(($(date +%s)-37500000)) +0200" $MORE_THAN_A_YEAR_REGEX # 1 year, 2 months ago
> +check_human_date "$(($(date +%s)-55188000)) +0200" $MORE_THAN_A_YEAR_REGEX # 1 year, 9 months ago
> +check_human_date "$(($(date +%s)-630000000)) +0200" $MORE_THAN_A_YEAR_REGEX # 20 years ago
> +
> test_done
> diff --git a/t/t7007-show.sh b/t/t7007-show.sh
> index 42d3db6246..0a0334a8b5 100755
> --- a/t/t7007-show.sh
> +++ b/t/t7007-show.sh
> @@ -128,4 +128,29 @@ test_expect_success 'show --graph is forbidden' '
> test_must_fail git show --graph HEAD
> '
>
> +check_human_date() {
> + commit_date=$1
> + expect=$2
> + test_expect_success "$commit_date" "
> + echo $expect $commit_date >dates &&
> + git add dates &&
> + git commit -m 'Expect String' --date=\"$commit_date\" dates &&
> + git show --date=human | grep \"^Date:\" >actual &&
> + grep \"$expect\" actual
> +"
> +}
> +
> +TODAY_REGEX='[A-Z][a-z][a-z] [012][0-9]:[0-6][0-9] .0200'
> +THIS_YEAR_REGEX='[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]* [012][0-9]:[0-6][0-9]'
> +MORE_THAN_A_YEAR_REGEX='[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]* [0-9][0-9][0-9][0-9]'
> +check_human_date "$(($(date +%s)-18000)) +0200" $TODAY_REGEX # 5 hours ago
> +check_human_date "$(($(date +%s)-432000)) +0200" $THIS_YEAR_REGEX # 5 days ago
> +check_human_date "$(($(date +%s)-1728000)) +0200" $THIS_YEAR_REGEX # 3 weeks ago
> +check_human_date "$(($(date +%s)-13000000)) +0200" $THIS_YEAR_REGEX # 5 months ago
> +check_human_date "$(($(date +%s)-31449600)) +0200" $THIS_YEAR_REGEX # 12 months ago
> +check_human_date "$(($(date +%s)-37500000)) +0200" $MORE_THAN_A_YEAR_REGEX # 1 year, 2 months ago
> +check_human_date "$(($(date +%s)-55188000)) +0200" $MORE_THAN_A_YEAR_REGEX # 1 year, 9 months ago
> +check_human_date "$(($(date +%s)-630000000)) +0200" $MORE_THAN_A_YEAR_REGEX # 20 years ago
The $...REGEX expansions must be put in double-quotes to protect them
from field splitting. But then the tests do not pass anymore (I tested
only t4202). Please revisit this change.
-- Hannes
next prev parent reply other threads:[~2019-01-08 21:27 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-31 0:31 [PATCH 0/3] Add 'human' date format Stephen P. Smith
2018-12-31 0:31 ` [PATCH 1/3] " Stephen P. Smith
2019-01-03 7:37 ` Jeff King
2019-01-03 13:19 ` Stephen P. Smith
2019-01-04 7:50 ` Jeff King
2019-01-04 13:03 ` Stephen P Smith
2019-01-06 6:19 ` Jeff King
2018-12-31 0:31 ` [PATCH 2/3] Add 'human' date format documentation Stephen P. Smith
2018-12-31 0:31 ` [PATCH 3/3] t0006-date.sh: add `human` date format tests Stephen P. Smith
2019-01-02 18:15 ` Junio C Hamano
2019-01-03 2:36 ` Stephen & Linda Smith
2019-01-03 6:42 ` Junio C Hamano
2019-01-03 13:20 ` Stephen P. Smith
2019-01-03 21:14 ` Philip Oakley
2019-01-03 21:45 ` Junio C Hamano
2019-01-03 23:57 ` Stephen P. Smith
2019-01-03 7:44 ` Jeff King
2019-01-03 13:12 ` Stephen & Linda Smith
2019-01-08 21:27 ` Johannes Sixt [this message]
2019-01-09 0:44 ` Stephen P. Smith
2019-01-09 6:58 ` Johannes Sixt
2019-01-10 1:50 ` Stephen & Linda Smith
2019-01-18 6:18 ` [PATCH v2 0/5] Re-roll of 'human' date format patch set Stephen P. Smith
2019-01-18 6:18 ` [PATCH v2 1/5] Add 'human' date format Stephen P. Smith
2019-01-18 6:18 ` [PATCH v2 2/5] Remove the proposed use of auto as secondary way to specify human Stephen P. Smith
2019-01-18 18:35 ` Junio C Hamano
2019-01-19 3:44 ` Stephen & Linda Smith
2019-01-18 6:18 ` [PATCH v2 3/5] Add 'human' date format documentation Stephen P. Smith
2019-01-18 18:47 ` Junio C Hamano
2019-01-18 6:18 ` [PATCH v2 4/5] Add `human` format to test-tool Stephen P. Smith
2019-01-18 19:03 ` Junio C Hamano
2019-01-20 22:11 ` Stephen P. Smith
2019-01-22 18:29 ` Junio C Hamano
2019-01-18 6:18 ` [PATCH v2 5/5] Add `human` date format tests Stephen P. Smith
2019-01-18 19:24 ` Junio C Hamano
2019-01-21 5:31 ` [PATCH v3 0/5] Re-roll of 'human' date format patch set Stephen P. Smith
2019-01-21 5:31 ` [PATCH v3 1/5] Add 'human' date format Stephen P. Smith
2019-01-21 5:31 ` [PATCH v3 2/5] Replace the proposed 'auto' mode with 'auto:' Stephen P. Smith
2019-01-21 5:31 ` [PATCH v3 3/5] Add 'human' date format documentation Stephen P. Smith
2019-01-21 5:31 ` [PATCH v3 4/5] Add `human` format to test-tool Stephen P. Smith
2019-01-22 22:34 ` Junio C Hamano
2019-01-21 5:31 ` [PATCH v3 5/5] Add `human` date format tests Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 0/5] Re-roll of 'human' date format patch set Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 1/5] Add 'human' date format Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 2/5] Replace the proposed 'auto' mode with 'auto:' Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 3/5] Add 'human' date format documentation Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 4/5] Add `human` format to test-tool Stephen P. Smith
2019-01-29 3:50 ` [PATCH v4 5/5] Add `human` date format tests Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 0/5] Re-roll of 'human' date format patch set Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 1/5] Add 'human' date format Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 2/5] Replace the proposed 'auto' mode with 'auto:' Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 3/5] Add 'human' date format documentation Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 4/5] Add `human` format to test-tool Stephen P. Smith
2019-01-21 5:16 ` [PATCH v3 5/5] Add `human` date format tests Stephen P. Smith
2019-01-21 15:04 ` SZEDER Gábor
2019-01-22 0:53 ` Stephen & Linda Smith
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a8a586d9-dad7-606f-948c-06725ac3e062@kdbg.org \
--to=j6t@kdbg.org \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ischis2@cox.net \
--cc=torvalds@linux-foundation.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).