From: Tuomas Ahola Date: Thu, 14 May 2026 11:55:17 GMT Subject: [PATCH v3 1/4] t0006: add support for approxidate test date adjustment Message-ID: <20260514115520.6660-2-taahol@utu.fi> In-Reply-To: <20260514115520.6660-1-taahol@utu.fi> t0006 uses a hard-coded test date and provides no convenient way to override it temporarily. Add an optional parameter to check_approxidate to adjust the time as needed, and demonstrate the feature with a new test. Signed-off-by: Tuomas Ahola --- Notes: > As you are not doing the test-date-now adjustment when $4 is not > given, wouldn't it be a lot easier to read if you did something like > > old_date=$GIT_TEST_DATE_NOW > if test -n "$4" > then > # the convention for $4 is a bit weird in that it > # comes with its own +/- operator in front. > GIT_TEST_DATE_NOW=$(( $old_date $4 * 60 * 60 )) > caption="$1; offset $4h" > else > caption=$1 > fi > > instead? Other two minor points are > > - Documentation/SubmittingPatches prefers an explicit "test" over > "[ ... ]", and have "then", "else", etc. on their own lines. > > - As you never "unset" GIT_TEST_DATE_NOW, you do not have to keep > exporting it. It is not like there are two variables (one for > shell, the other for environment) and every time you set the > shell one you need to export to reflect the value to the > environment one. Rather, a single "export" marks a shell > variable and every time it changes value, it is updated in the > environment as well. > Thanks, applied. > One, it sucks to have to say "success" here, but is awkward because now > we have two optional arguments. There's nobody passing "failure" right > now, so we could just drop support, though that might be annoying later > when somebody wants to add a failing test. But we could perhaps switch > to allowing: > Ok, now it works without "success" in between, and "failure" works without an offset, too. check_approxidate [] [failure] > The second thing is that "+48" is pretty opaque. It's a relative offset > to some arbitrary point. To some degree the script already suffers from > that (all of the tests are using some arbitrary point), but I think the > offset (without units!) adds a layer of indirection that makes it even > more confusing. > Good catch. Now it is at least marginally better with the added units. t/t0006-date.sh | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/t/t0006-date.sh b/t/t0006-date.sh index 53ced36df4..c7667bade2 100755 --- a/t/t0006-date.sh +++ b/t/t0006-date.sh @@ -155,12 +155,41 @@ check_parse '2100-00-00 00:00:00 -11' bad check_parse '2100-00-00 00:00:00 +11' bad REQUIRE_64BIT_TIME= +add_time_offset() { + case "$3" in + hours) + unit=$(( 60*60 )) + ;; + days) + unit=$(( 24*60*60 )) + ;; + esac + offset=$(( $2 * unit )) + echo $(( $1 + offset )) +} + check_approxidate() { + old_date=$GIT_TEST_DATE_NOW + if test "$3" = "failure" + then + expection="$3" + else + expection=${4:-success} + offset="$3" + fi + if test -n "$offset" + then + GIT_TEST_DATE_NOW=$(add_time_offset $old_date $offset) + caption="$1; offset $offset" + else + caption=$1 + fi echo "$1 -> $2 +0000" >expect - test_expect_${3:-success} "parse approxidate ($1)" " + test_expect_$expection "parse approxidate ($caption)" " test-tool date approxidate '$1' >actual && test_cmp expect actual " + GIT_TEST_DATE_NOW=$old_date } check_approxidate now '2009-08-30 19:20:00' @@ -182,6 +211,8 @@ check_approxidate 'noon today' '2009-08-30 12:00:00' check_approxidate 'noon yesterday' '2009-08-29 12:00:00' check_approxidate 'January 5th noon pm' '2009-01-05 12:00:00' check_approxidate '10am noon' '2009-08-29 12:00:00' +check_approxidate 'January 5th yesterday' '2009-01-29 19:20:00' +check_approxidate 'January 5th yesterday' '2008-12-31 19:20:00' '+2 days' check_approxidate 'last tuesday' '2009-08-25 19:20:00' check_approxidate 'July 5th' '2009-07-05 19:20:00' -- 2.30.2