# # # patch "tests/changelog_editor/__driver__.lua" # from [96e979a9afb3cdab37abc18f09b32044d8f5a4ab] # to [f891608f0776e2ff3e5e58296b53647fff41c5f2] # # patch "unit-tests/dates.cc" # from [cff226d0fad7b877ce95f1e14533379e7472f1d7] # to [d33c41f5779d6f127316589989c563a09e5892ac] # ============================================================ --- tests/changelog_editor/__driver__.lua 96e979a9afb3cdab37abc18f09b32044d8f5a4ab +++ tests/changelog_editor/__driver__.lua f891608f0776e2ff3e5e58296b53647fff41c5f2 @@ -8,7 +8,7 @@ check(mtn("status"), 0, false, false) -- status warns with bad date format check(mtn("status"), 0, false, false) -check(mtn("status", "--date-format", "%F"), 0, false, true) +check(mtn("status", "--date-format", "%Y-%m-%d"), 0, false, true) check(qgrep("date format", "stderr")) @@ -17,7 +17,7 @@ check(qgrep("date format", "stderr")) -- commit fails with bad date format -check(mtn("commit", "--date-format", "%F"), 1, false, true) +check(mtn("commit", "--date-format", "%Y-%m-%d"), 1, false, true) check(qgrep("date format", "stderr")) check(not exists("_MTN/commit")) ============================================================ --- unit-tests/dates.cc cff226d0fad7b877ce95f1e14533379e7472f1d7 +++ unit-tests/dates.cc d33c41f5779d6f127316589989c563a09e5892ac @@ -293,8 +293,8 @@ UNIT_TEST(localtime_formats) // these all seem to work with the test setup of LANG=C and TZ=UTC - OK(date, "%F %X"); // YYYY-MM-DD hh:mm:ss - OK(date, "%X %F"); // hh:mm:ss YYYY-MM-DD + OK(date, "%Y-%m-%d %X"); // YYYY-MM-DD hh:mm:ss + OK(date, "%X %Y-%m-%d"); // hh:mm:ss YYYY-MM-DD OK(date, "%d %b %Y, %I:%M:%S %p"); OK(date, "%a %b %d %H:%M:%S %Y"); OK(date, "%a %d %b %Y %I:%M:%S %p %z"); @@ -314,7 +314,7 @@ UNIT_TEST(localtime_formats) // check that trailing characters not matched by the date format are caught UNIT_TEST_CHECK_THROW(date_t::from_formatted_localtime("1988-01-01 12:12:12 gobbledygook", - "%F %X"), + "%Y-%m-%d %X"), recoverable_failure); #undef OK