git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 1/3] t0006: add support for approxidate test date adjustment

From
Jeff King <peff@peff.net>
Date
May 12, 2026, 18:35 UTC
Message-ID
<20260512183519.GA70851@coredump.intra.peff.net>
In-Reply-To
<20260512145430.13212-2-taahol@utu.fi>
On Tue, May 12, 2026 at 05:54:28PM +0300, Tuomas Ahola wrote:
> 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.
Makes sense, but two small-ish comments:
> +check_approxidate 'January 5th yesterday' '2008-12-31 19:20:00' success +48

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:

  check_approxidate --failure 'January 5th yesterday' ...etc
which is fairly natural.

This is something we've run into in many different test scripts, and I think the harness could do a better job of supporting this. Perhaps with something like:

  test_expect() {
	if "$GIT_TEST_EXPECT" = "fail"
	then
		test_expect_failure "$@"
	else
		test_expect_success "$@"
  }
  test_fails() {
	# probably needs to be more careful of one-shot with functions
	GIT_TEST_EXPECT=fail "$@"
  }
  # this is a normal passing test snippet
  test_expect 'foo' 'git foo'
  # this one expects failure, but it can be toggled easily by
  # removing the leading "test_fails" wrapper. Not much better
  # than swapping out s/failure/success/ now. But...
  test_fails test_expect 'bar' 'git bar'
  # this one just does the right thing if the helper function
  # is using test_expect under the hood
  test_fails check_approxidate ...

I dunno. It is probably too big a rabbit hole to do before your series, so mostly I'm just thinking out loud.

> +check_approxidate 'January 5th yesterday' '2008-12-31 19:20:00' success +48

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.

I wonder how hard it would be to just take an arbitrary time instead, and then you could write:

  check_approxidate 'January 5th yesterday' '2008-12-31 19:20:00' '2009-08-28 12:00:00'

or whatever. There is a chicken-and-egg problem with testing our date routines and using the date routines to parse out the starting point. But I think for approxidate, we could be using the strict parser (tested separately earlier via check_parse) to handle the base time.

-Peff
Previous: Junio C HamanoNext: Tuomas Ahola
Message 9 of 36 in “approxidate: tweak special date formats”
  1. 0/2 approxidate: tweak special date formatsTuomas Ahola, Mar 18, 2025
  2. 2/2 approxidate: overwrite tm_mday for `now` and `yesterday`Tuomas Ahola, Mar 18, 2025
  3. Jeff KingApr 4, 2025
  4. 1/2 approxidate: make "specials" respect fixed day-of-monthTuomas Ahola, Mar 18, 2025
  5. Jeff KingApr 4, 2025
  6. 0/3 approxidate: tweak special date formatsTuomas Ahola, May 12, 2026
  7. 1/3 t0006: add support for approxidate test date adjustmentTuomas Ahola, May 12, 2026
  8. Junio C HamanoMay 12, 2026
  9. Jeff KingMay 12, 2026
  10. 2/3 approxidate: make "specials" respect fixed day-of-monthTuomas Ahola, May 12, 2026
  11. Junio C HamanoMay 12, 2026
  12. 3/3 approxidate: use deferred mday adjustments for "specials"Tuomas Ahola, May 12, 2026
  13. 0/4 approxidate: tweak special date formatsTuomas Ahola, May 14, 2026
  14. 2/4 approxidate: alias "today" to "now"Tuomas Ahola, May 14, 2026
  15. Junio C HamanoMay 14, 2026
  16. Tuomas AholaMay 14, 2026
  17. Junio C HamanoMay 15, 2026
  18. Junio C HamanoMay 15, 2026
  19. Tuomas AholaMay 15, 2026
  20. 1/4 t0006: add support for approxidate test date adjustmentTuomas Ahola, May 14, 2026
  21. 3/4 approxidate: make "specials" respect fixed day-of-monthTuomas Ahola, May 14, 2026
  22. Junio C HamanoMay 14, 2026
  23. 4/4 approxidate: use deferred mday adjustments for "specials"Tuomas Ahola, May 14, 2026
  24. 0/4 approxidate: tweak special date formatsTuomas Ahola, May 16, 2026
  25. 4/4 approxidate: use deferred mday adjustments for "specials"Tuomas Ahola, May 16, 2026
  26. fixup! approxidate: use deferred mday adjustments for "specials"Tuomas Ahola, May 18, 2026
  27. 2/4 t0006: add support for approxidate test date adjustmentTuomas Ahola, May 16, 2026
  28. 1/4 approxidate: make "today" wrap to midnightTuomas Ahola, May 16, 2026
  29. 3/4 approxidate: make "specials" respect fixed day-of-monthTuomas Ahola, May 16, 2026
  30. 0/4 approxidate: tweak special date formatsTuomas Ahola, May 21, 2026
  31. 1/4 approxidate: make "today" wrap to midnightTuomas Ahola, May 21, 2026
  32. 3/4 approxidate: make "specials" respect fixed day-of-monthTuomas Ahola, May 21, 2026
  33. 4/4 approxidate: use deferred mday adjustments for "specials"Tuomas Ahola, May 21, 2026
  34. 2/4 t0006: add support for approxidate test date adjustmentTuomas Ahola, May 21, 2026
  35. Junio C HamanoMay 21, 2026
  36. Tuomas AholaMay 21, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.