picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
Systemd/src/test/test-calendarspec.c

253 lines
12 KiB
C
Raw Normal View History

Add SPDX license identifiers to source files under the LGPL This follows what the kernel is doing, c.f. https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5fd54ace4721fc5ce2bb5aef6318fcf17f421460.
2017-11-18 17:09:20 +01:00
/* SPDX-License-Identifier: LGPL-2.1+ */
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
util-lib: split out allocation calls into alloc-util.[ch]
2015-10-27 03:01:06 +01:00
#include "alloc-util.h"
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
#include "calendarspec.h"
tree-wide: introduce strerror_safe()
2019-07-03 16:56:17 +02:00
#include "errno-util.h"
util-lib: split our string related calls from util.[ch] into its own file string-util.[ch] There are more than enough calls doing string manipulations to deserve its own files, hence do something about it. This patch also sorts the #include blocks of all files that needed to be updated, according to the sorting suggestions from CODING_STYLE. Since pretty much every file needs our string manipulation functions this effectively means that most files have sorted #include blocks now. Also touches a few unrelated include files.
2015-10-24 22:58:24 +02:00
#include "string-util.h"
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
#include "util.h"
static void test_one(const char *input, const char *output) {
CalendarSpec *c;
test: extend calendarspec test a bit
2012-11-23 21:50:51 +01:00
_cleanup_free_ char *p = NULL, *q = NULL;
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
usec_t u;
char buf[FORMAT_TIMESTAMP_MAX];
int r;
assert_se(calendar_spec_from_string(input, &c) >= 0);
assert_se(calendar_spec_to_string(c, &p) >= 0);
printf("\"%s\" → \"%s\"\n", input, p);
assert_se(streq(p, output));
u = now(CLOCK_REALTIME);
r = calendar_spec_next_usec(c, u, &u);
tree-wide: introduce strerror_safe()
2019-07-03 16:56:17 +02:00
printf("Next: %s\n", r < 0 ? strerror_safe(r) : format_timestamp(buf, sizeof(buf), u));
test: extend calendarspec test a bit
2012-11-23 21:50:51 +01:00
calendar_spec_free(c);
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
test: extend calendarspec test a bit
2012-11-23 21:50:51 +01:00
assert_se(calendar_spec_from_string(p, &c) >= 0);
assert_se(calendar_spec_to_string(c, &q) >= 0);
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
calendar_spec_free(c);
test: extend calendarspec test a bit
2012-11-23 21:50:51 +01:00
assert_se(streq(q, p));
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
}
test: add calendarspec UTC tests
2015-10-15 01:58:00 +02:00
static void test_next(const char *input, const char *new_tz, usec_t after, usec_t expect) {
CalendarSpec *c;
usec_t u;
char *old_tz;
char buf[FORMAT_TIMESTAMP_MAX];
int r;
old_tz = getenv("TZ");
if (old_tz)
old_tz = strdupa(old_tz);
tree-wide: fix how we set $TZ According to tzset(3) we need to prefix timezone names with ":". Let's do so hence, to avoid any ambiguities and follow documented behaviour.
2019-11-12 17:52:35 +01:00
if (new_tz) {
char *colon_tz;
colon_tz = strjoina(":", new_tz);
assert_se(setenv("TZ", colon_tz, 1) >= 0);
} else
test: add calendarspec UTC tests
2015-10-15 01:58:00 +02:00
assert_se(unsetenv("TZ") >= 0);
tzset();
assert_se(calendar_spec_from_string(input, &c) >= 0);
printf("\"%s\"\n", input);
u = after;
r = calendar_spec_next_usec(c, after, &u);
basic/time-util: add function to format timestamps with different styles Instead of a multiple fixed format helper functions, add an enum and a single helper, so that it's easier to extend in the future.
2020-06-19 12:24:09 +02:00
printf("At: %s\n", r < 0 ? strerror_safe(r) : format_timestamp_style(buf, sizeof buf, u, TIMESTAMP_US));
test: add calendarspec UTC tests
2015-10-15 01:58:00 +02:00
if (expect != (usec_t)-1)
assert_se(r >= 0 && u == expect);
else
assert(r == -ENOENT);
calendar_spec_free(c);
if (old_tz)
assert_se(setenv("TZ", old_tz, 1) >= 0);
else
assert_se(unsetenv("TZ") >= 0);
tzset();
}
util-lib: make timestamp generation and parsing reversible (#3869) This patch improves parsing and generation of timestamps and calendar specifications in two ways: - The week day is now always printed in the abbreviated English form, instead of the locale's setting. This makes sure we can always parse the week day again, even if the locale is changed. Given that we don't follow locale settings for printing timestamps in any other way either (for example, we always use 24h syntax in order to make uniform parsing possible), it only makes sense to also stick to a generic, non-localized form for the timestamp, too. - When parsing a timestamp, the local timezone (in its DST or non-DST name) may be specified, in addition to "UTC". Other timezones are still not supported however (not because we wouldn't want to, but mostly because libc offers no nice API for that). In itself this brings no new features, however it ensures that any locally formatted timestamp's timezone is also parsable again. These two changes ensure that the output of format_timestamp() may always be passed to parse_timestamp() and results in the original input. The related flavours for usec/UTC also work accordingly. Calendar specifications are extended in a similar way. The man page is updated accordingly, in particular this removes the claim that timestamps systemd prints wouldn't be parsable by systemd. They are now. The man page previously showed invalid timestamps as examples. This has been removed, as the man page shouldn't be a unit test, where such negative examples would be useful. The man page also no longer mentions the names of internal functions, such as format_timestamp_us() or UNIX error codes such as EINVAL.
2016-08-04 01:04:53 +02:00
static void test_timestamp(void) {
char buf[FORMAT_TIMESTAMP_MAX];
_cleanup_free_ char *t = NULL;
CalendarSpec *c;
usec_t x, y;
/* Ensure that a timestamp is also a valid calendar specification. Convert forth and back */
x = now(CLOCK_REALTIME);
basic/time-util: add function to format timestamps with different styles Instead of a multiple fixed format helper functions, add an enum and a single helper, so that it's easier to extend in the future.
2020-06-19 12:24:09 +02:00
assert_se(format_timestamp_style(buf, sizeof(buf), x, TIMESTAMP_US));
util-lib: make timestamp generation and parsing reversible (#3869) This patch improves parsing and generation of timestamps and calendar specifications in two ways: - The week day is now always printed in the abbreviated English form, instead of the locale's setting. This makes sure we can always parse the week day again, even if the locale is changed. Given that we don't follow locale settings for printing timestamps in any other way either (for example, we always use 24h syntax in order to make uniform parsing possible), it only makes sense to also stick to a generic, non-localized form for the timestamp, too. - When parsing a timestamp, the local timezone (in its DST or non-DST name) may be specified, in addition to "UTC". Other timezones are still not supported however (not because we wouldn't want to, but mostly because libc offers no nice API for that). In itself this brings no new features, however it ensures that any locally formatted timestamp's timezone is also parsable again. These two changes ensure that the output of format_timestamp() may always be passed to parse_timestamp() and results in the original input. The related flavours for usec/UTC also work accordingly. Calendar specifications are extended in a similar way. The man page is updated accordingly, in particular this removes the claim that timestamps systemd prints wouldn't be parsable by systemd. They are now. The man page previously showed invalid timestamps as examples. This has been removed, as the man page shouldn't be a unit test, where such negative examples would be useful. The man page also no longer mentions the names of internal functions, such as format_timestamp_us() or UNIX error codes such as EINVAL.
2016-08-04 01:04:53 +02:00
printf("%s\n", buf);
assert_se(calendar_spec_from_string(buf, &c) >= 0);
assert_se(calendar_spec_to_string(c, &t) >= 0);
calendar_spec_free(c);
printf("%s\n", t);
assert_se(parse_timestamp(t, &y) >= 0);
assert_se(y == x);
}
test-calendarspec: test that hourly timers are incremented properly Apparently this works just fine, so the issue in #4031 is elsewhere.
2016-10-17 06:08:43 +02:00
static void test_hourly_bug_4031(void) {
CalendarSpec *c;
usec_t n, u, w;
char buf[FORMAT_TIMESTAMP_MAX], zaf[FORMAT_TIMESTAMP_MAX];
int r;
assert_se(calendar_spec_from_string("hourly", &c) >= 0);
n = now(CLOCK_REALTIME);
assert_se((r = calendar_spec_next_usec(c, n, &u)) >= 0);
basic/time-util: add function to format timestamps with different styles Instead of a multiple fixed format helper functions, add an enum and a single helper, so that it's easier to extend in the future.
2020-06-19 12:24:09 +02:00
printf("Now: %s (%"PRIu64")\n", format_timestamp_style(buf, sizeof buf, n, TIMESTAMP_US), n);
printf("Next hourly: %s (%"PRIu64")\n", r < 0 ? strerror_safe(r) : format_timestamp_style(buf, sizeof buf, u, TIMESTAMP_US), u);
test-calendarspec: test that hourly timers are incremented properly Apparently this works just fine, so the issue in #4031 is elsewhere.
2016-10-17 06:08:43 +02:00
assert_se((r = calendar_spec_next_usec(c, u, &w)) >= 0);
basic/time-util: add function to format timestamps with different styles Instead of a multiple fixed format helper functions, add an enum and a single helper, so that it's easier to extend in the future.
2020-06-19 12:24:09 +02:00
printf("Next hourly: %s (%"PRIu64")\n", r < 0 ? strerror_safe(r) : format_timestamp_style(zaf, sizeof zaf, w, TIMESTAMP_US), w);
test-calendarspec: test that hourly timers are incremented properly Apparently this works just fine, so the issue in #4031 is elsewhere.
2016-10-17 06:08:43 +02:00
assert_se(n < u);
assert_se(u <= n + USEC_PER_HOUR);
assert_se(u < w);
assert_se(w <= u + USEC_PER_HOUR);
tests: fix memleak in test-calendarspec (#4424) Fixes: ``` ==10750== ==10750== HEAP SUMMARY: ==10750== in use at exit: 96 bytes in 3 blocks ==10750== total heap usage: 1,711 allocs, 1,708 frees, 854,545 bytes allocated ==10750== ==10750== 96 (64 direct, 32 indirect) bytes in 1 blocks are definitely lost in loss record 3 of 3 ==10750== at 0x4C2DA60: calloc (vg_replace_malloc.c:711) ==10750== by 0x4EB3BDA: calendar_spec_from_string (calendarspec.c:771) ==10750== by 0x109675: test_hourly_bug_4031 (test-calendarspec.c:118) ==10750== by 0x10A00E: main (test-calendarspec.c:202) ==10750== ==10750== LEAK SUMMARY: ==10750== definitely lost: 64 bytes in 1 blocks ==10750== indirectly lost: 32 bytes in 2 blocks ==10750== possibly lost: 0 bytes in 0 blocks ==10750== still reachable: 0 bytes in 0 blocks ==10750== suppressed: 0 bytes in 0 blocks ==10750== ==10750== For counts of detected and suppressed errors, rerun with: -v ==10750== ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0) ```
2016-10-20 17:44:30 +02:00
calendar_spec_free(c);
test-calendarspec: test that hourly timers are incremented properly Apparently this works just fine, so the issue in #4031 is elsewhere.
2016-10-17 06:08:43 +02:00
}
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
int main(int argc, char* argv[]) {
CalendarSpec *c;
calendarspec: use ".." notation for ranges of weekdays For backwards compatibility, both the new format (Mon..Wed) and the old format (Mon-Wed) are supported.
2016-07-01 04:26:07 +02:00
test_one("Sat,Thu,Mon-Wed,Sat-Sun", "Mon..Thu,Sat,Sun *-*-* 00:00:00");
test_one("Sat,Thu,Mon..Wed,Sat..Sun", "Mon..Thu,Sat,Sun *-*-* 00:00:00");
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
test_one("Mon,Sun 12-*-* 2,1:23", "Mon,Sun 2012-*-* 01,02:23:00");
test_one("Wed *-1", "Wed *-*-01 00:00:00");
test_one("Wed-Wed,Wed *-1", "Wed *-*-01 00:00:00");
calendarspec: use ".." notation for ranges of weekdays For backwards compatibility, both the new format (Mon..Wed) and the old format (Mon-Wed) are supported.
2016-07-01 04:26:07 +02:00
test_one("Wed..Wed,Wed *-1", "Wed *-*-01 00:00:00");
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
test_one("Wed, 17:48", "Wed *-*-* 17:48:00");
calendarspec: reject open weekday ranges Forbid open ranges like "Tue.."; trailing commas are still OK.
2016-11-24 20:04:13 +01:00
test_one("Wednesday,", "Wed *-*-* 00:00:00");
calendarspec: use ".." notation for ranges of weekdays For backwards compatibility, both the new format (Mon..Wed) and the old format (Mon-Wed) are supported.
2016-07-01 04:26:07 +02:00
test_one("Wed-Sat,Tue 12-10-15 1:2:3", "Tue..Sat 2012-10-15 01:02:03");
test_one("Wed..Sat,Tue 12-10-15 1:2:3", "Tue..Sat 2012-10-15 01:02:03");
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
test_one("*-*-7 0:0:0", "*-*-07 00:00:00");
test_one("10-15", "*-10-15 00:00:00");
test_one("monday *-12-* 17:00", "Mon *-12-* 17:00:00");
calendarspec: allow repetition values with ranges "Every other hour from 9 until 5" can be written as `9..17/2:00` instead of `9,11,13,15,17:00`
2016-12-16 02:02:10 +01:00
test_one("Mon,Fri *-*-3,1,2 *:30:45", "Mon,Fri *-*-01,02,03 *:30:45");
test_one("12,14,13,12:20,10,30", "*-*-* 12,13,14:10,20,30:00");
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
test_one("mon,fri *-1/2-1,3 *:30:45", "Mon,Fri *-01/2-01,03 *:30:45");
test_one("03-05 08:05:40", "*-03-05 08:05:40");
test_one("08:05:40", "*-*-* 08:05:40");
test_one("05:40", "*-*-* 05:40:00");
test_one("Sat,Sun 12-05 08:05:40", "Sat,Sun *-12-05 08:05:40");
test_one("Sat,Sun 08:05:40", "Sat,Sun *-*-* 08:05:40");
test_one("2003-03-05 05:40", "2003-03-05 05:40:00");
test_one("2003-03-05", "2003-03-05 00:00:00");
test_one("03-05", "*-03-05 00:00:00");
test_one("hourly", "*-*-* *:00:00");
test_one("daily", "*-*-* 00:00:00");
test_one("monthly", "*-*-01 00:00:00");
test_one("weekly", "Mon *-*-* 00:00:00");
calendarspec: parse 'quarterly' and 'semi-annually' as shortcuts
2014-10-27 18:08:46 +01:00
test_one("minutely", "*-*-* *:*:00");
test_one("quarterly", "*-01,04,07,10-01 00:00:00");
test_one("semi-annually", "*-01,07-01 00:00:00");
test_one("annually", "*-01-01 00:00:00");
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
test_one("*:2/3", "*-*-* *:02/3:00");
test: add calendarspec UTC tests
2015-10-15 01:58:00 +02:00
test_one("2015-10-25 01:00:00 uTc", "2015-10-25 01:00:00 UTC");
Added timezone to the CalendarSpec, parser/formatter and the timedatectl
2017-09-06 11:56:36 +02:00
test_one("2015-10-25 01:00:00 Asia/Vladivostok", "2015-10-25 01:00:00 Asia/Vladivostok");
test_one("weekly Pacific/Auckland", "Mon *-*-* 00:00:00 Pacific/Auckland");
test: calendarspec sub-second tests
2015-11-16 09:15:16 +01:00
test_one("2016-03-27 03:17:00.4200005", "2016-03-27 03:17:00.420001");
test_one("2016-03-27 03:17:00/0.42", "2016-03-27 03:17:00/0.420000");
calendarspec: make specifications with ranges reversible "*-*-01..03" is now formatted as "*-*-01..03" instead of "*-*-01,02,03"
2016-11-24 21:41:04 +01:00
test_one("9..11,13:00,30", "*-*-* 09..11,13:00,30:00");
test_one("1..3-1..3 1..3:1..3", "*-01..03-01..03 01..03:01..03:00");
calendarspec: allow repetition values with ranges "Every other hour from 9 until 5" can be written as `9..17/2:00` instead of `9,11,13,15,17:00`
2016-12-16 02:02:10 +01:00
test_one("00:00:1.125..2.125", "*-*-* 00:00:01.125000..02.125000");
calendarspec: make specifications with ranges reversible "*-*-01..03" is now formatted as "*-*-01..03" instead of "*-*-01,02,03"
2016-11-24 21:41:04 +01:00
test_one("00:00:1.0..3.8", "*-*-* 00:00:01..03");
test_one("00:00:01..03", "*-*-* 00:00:01..03");
calendarspec: allow repetition values with ranges "Every other hour from 9 until 5" can be written as `9..17/2:00` instead of `9,11,13,15,17:00`
2016-12-16 02:02:10 +01:00
test_one("00:00:01/2,02..03", "*-*-* 00:00:01/2,02..03");
calendarspec: add support for scheduling timers at the end of the month "*-*~1" => The last day of every month "*-02~3..5" => The third, fourth, and fifth last days in February "Mon 05~07/1" => The last Monday in May Resolves #3861
2016-11-22 16:05:10 +01:00
test_one("*-*~1 Utc", "*-*~01 00:00:00 UTC");
test_one("*-*~05,3 ", "*-*~03,05 00:00:00");
test_one("*-*~* 00:00:00", "*-*-* 00:00:00");
calendarspec: always interpret a missing time as 00:00:00 "*-*-*" is now equivalent to "*-*-* 00:00:00" (daily) rather than "*-*-* *:*:*" (every second).
2016-11-24 17:50:06 +01:00
test_one("Monday", "Mon *-*-* 00:00:00");
test_one("Monday *-*-*", "Mon *-*-* 00:00:00");
test_one("*-*-*", "*-*-* 00:00:00");
calendarspec: make specifications with seconds wildcard reversible "*:*:*" is now formatted as "*:*:*" instead of "*:*:00/1"
2016-11-24 20:34:17 +01:00
test_one("*:*:*", "*-*-* *:*:*");
calendarspec: always interpret missing seconds as :00 (#4813) "*:*" should be equivalent to "*-*-* *:*:00" (minutely) rather than running every microsecond. Fixes #4804
2016-12-06 20:41:15 +01:00
test_one("*:*", "*-*-* *:*:00");
test_one("12:*", "*-*-* 12:*:00");
test_one("*:30", "*-*-* *:30:00");
calendarspec: allow repetition values with ranges "Every other hour from 9 until 5" can be written as `9..17/2:00` instead of `9,11,13,15,17:00`
2016-12-16 02:02:10 +01:00
test_one("93..00-*-*", "1993..2000-*-* 00:00:00");
test_one("00..07-*-*", "2000..2007-*-* 00:00:00");
test_one("*:20..39/5", "*-*-* *:20..35/5:00");
test_one("00:00:20..40/1", "*-*-* 00:00:20..40");
calendarspec: fix duplicate detection (#5310) a2eb5ea79c added a new field to `CalendarComponent`; update `normalize_chain` to compare all fields when dropping duplicates
2017-02-12 06:39:17 +01:00
test_one("*~03/1,03..05", "*-*~03/1,03..05 00:00:00");
calendarspec: parse unix timestamps (@...) (#5947) Fixes #5810.
2017-05-17 11:40:49 +02:00
/* UNIX timestamps are always UTC */
test_one("@1493187147", "2017-04-26 06:12:27 UTC");
test_one("@1493187147 UTC", "2017-04-26 06:12:27 UTC");
test_one("@0", "1970-01-01 00:00:00 UTC");
test_one("@0 UTC", "1970-01-01 00:00:00 UTC");
calendarspec: be more graceful with two kinds of calendar expressions This changes the calendarspec parser to allow expressions such as "00:05..05", i.e. a range where start and end is the same. It also allows expressions such as "00:1-2/3", i.e. where the repetition value does not fit even once in the specified range. With this patch both cases will now be optimized away, i.e. the range is removed and a fixed value is used, which is functionally equivalent. See #15030 for an issue where the inability to parse such expressions caused confusion. I think it's probably better to accept these gracefully and optimizing them away instead of refusing them with a plain EINVAL. With a tool such as "systemd-analyze" calendar it should be easy to figure out the normalized form with the redundant bits optimized away.
2020-04-30 13:24:31 +02:00
test_one("*:05..05", "*-*-* *:05:00");
test_one("*:05..10/6", "*-*-* *:05:00");
test: add calendarspec UTC tests
2015-10-15 01:58:00 +02:00
test_next("2016-03-27 03:17:00", "", 12345, 1459048620000000);
test_next("2016-03-27 03:17:00", "CET", 12345, 1459041420000000);
test_next("2016-03-27 03:17:00", "EET", 12345, -1);
test_next("2016-03-27 03:17:00 UTC", NULL, 12345, 1459048620000000);
test_next("2016-03-27 03:17:00 UTC", "", 12345, 1459048620000000);
test_next("2016-03-27 03:17:00 UTC", "CET", 12345, 1459048620000000);
test_next("2016-03-27 03:17:00 UTC", "EET", 12345, 1459048620000000);
test: calendarspec sub-second tests
2015-11-16 09:15:16 +01:00
test_next("2016-03-27 03:17:00.420000001 UTC", "EET", 12345, 1459048620420000);
test_next("2016-03-27 03:17:00.4200005 UTC", "EET", 12345, 1459048620420001);
test_next("2015-11-13 09:11:23.42", "EET", 12345, 1447398683420000);
test_next("2015-11-13 09:11:23.42/1.77", "EET", 1447398683420000, 1447398685190000);
test_next("2015-11-13 09:11:23.42/1.77", "EET", 1447398683419999, 1447398683420000);
calendarspec: fix find_next skipping times reset usec when bumping hours/minutes
2016-02-22 14:02:48 +01:00
test_next("Sun 16:00:00", "CET", 1456041600123456, 1456066800000000);
calendarspec: add upper bound on year Stop looking for matches after MAX_YEAR so impossible dates like "*-02-30" and "*-04-31" don't cause an infinite loop.
2016-11-22 18:57:07 +01:00
test_next("*-04-31", "", 12345, -1);
calendarspec: add support for scheduling timers at the end of the month "*-*~1" => The last day of every month "*-02~3..5" => The third, fourth, and fifth last days in February "Mon 05~07/1" => The last Monday in May Resolves #3861
2016-11-22 16:05:10 +01:00
test_next("2016-02~01 UTC", "", 12345, 1456704000000000);
test_next("Mon 2017-05~01..07 UTC", "", 12345, 1496016000000000);
test_next("Mon 2017-05~07/1 UTC", "", 12345, 1496016000000000);
calendarspec: allow repetition values with ranges "Every other hour from 9 until 5" can be written as `9..17/2:00` instead of `9,11,13,15,17:00`
2016-12-16 02:02:10 +01:00
test_next("2017-08-06 9,11,13,15,17:00 UTC", "", 1502029800000000, 1502031600000000);
test_next("2017-08-06 9..17/2:00 UTC", "", 1502029800000000, 1502031600000000);
test_next("2016-12-* 3..21/6:00 UTC", "", 1482613200000001, 1482634800000000);
Added timezone to the CalendarSpec, parser/formatter and the timedatectl
2017-09-06 11:56:36 +02:00
test_next("2017-09-24 03:30:00 Pacific/Auckland", "", 12345, 1506177000000000);
// Due to daylight saving time - 2017-09-24 02:30:00 does not exist
test_next("2017-09-24 02:30:00 Pacific/Auckland", "", 12345, -1);
test_next("2017-04-02 02:30:00 Pacific/Auckland", "", 12345, 1491053400000000);
// Confirm that even though it's a time change here (backward) 02:30 happens only once
test_next("2017-04-02 02:30:00 Pacific/Auckland", "", 1491053400000000, -1);
test_next("2017-04-02 03:30:00 Pacific/Auckland", "", 12345, 1491060600000000);
// Confirm that timezones in the Spec work regardless of current timezone
test_next("2017-09-09 20:42:00 Pacific/Auckland", "", 12345, 1504946520000000);
test_next("2017-09-09 20:42:00 Pacific/Auckland", "EET", 12345, 1504946520000000);
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
assert_se(calendar_spec_from_string("test", &c) < 0);
calendarspec: reject strings that only contain a timezone This makes " UTC" an illegal date specification.
2016-11-24 18:21:37 +01:00
assert_se(calendar_spec_from_string(" utc", &c) < 0);
calendarspec: always interpret a missing time as 00:00:00 "*-*-*" is now equivalent to "*-*-* 00:00:00" (daily) rather than "*-*-* *:*:*" (every second).
2016-11-24 17:50:06 +01:00
assert_se(calendar_spec_from_string(" ", &c) < 0);
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
assert_se(calendar_spec_from_string("", &c) < 0);
assert_se(calendar_spec_from_string("7", &c) < 0);
assert_se(calendar_spec_from_string("121212:1:2", &c) < 0);
test: calendarspec sub-second tests
2015-11-16 09:15:16 +01:00
assert_se(calendar_spec_from_string("2000-03-05.23 00:00:00", &c) < 0);
assert_se(calendar_spec_from_string("2000-03-05 00:00.1:00", &c) < 0);
assert_se(calendar_spec_from_string("00:00:00/0.00000001", &c) < 0);
calendarspec: allow ranges in date and time specifications Resolves #3042
2016-07-01 02:16:05 +02:00
assert_se(calendar_spec_from_string("00:00:00.0..00.9", &c) < 0);
calendarspec: add support for scheduling timers at the end of the month "*-*~1" => The last day of every month "*-02~3..5" => The third, fourth, and fifth last days in February "Mon 05~07/1" => The last Monday in May Resolves #3861
2016-11-22 16:05:10 +01:00
assert_se(calendar_spec_from_string("2016~11-22", &c) < 0);
assert_se(calendar_spec_from_string("*-*~5/5", &c) < 0);
calendarspec: reject open weekday ranges Forbid open ranges like "Tue.."; trailing commas are still OK.
2016-11-24 20:04:13 +01:00
assert_se(calendar_spec_from_string("Monday.. 12:00", &c) < 0);
assert_se(calendar_spec_from_string("Monday..", &c) < 0);
calendarspec: reject strings with spurious spaces and signs strtoul() parses leading whitespace and an optional sign; check that the first character is a digit to prevent odd specifications like "00: 00: 00" and "-00:+00/-1".
2016-11-24 18:47:55 +01:00
assert_se(calendar_spec_from_string("-00:+00/-5", &c) < 0);
assert_se(calendar_spec_from_string("00:+00/-5", &c) < 0);
assert_se(calendar_spec_from_string("2016- 11- 24 12: 30: 00", &c) < 0);
calendarspec: allow repetition values with ranges "Every other hour from 9 until 5" can be written as `9..17/2:00` instead of `9,11,13,15,17:00`
2016-12-16 02:02:10 +01:00
assert_se(calendar_spec_from_string("*~29", &c) < 0);
assert_se(calendar_spec_from_string("*~16..31", &c) < 0);
assert_se(calendar_spec_from_string("12..1/2-*", &c) < 0);
assert_se(calendar_spec_from_string("20/4:00", &c) < 0);
assert_se(calendar_spec_from_string("00:00/60", &c) < 0);
calendarspec: improve overflow handling Check if the parsed seconds value fits in an integer *after* multiplying by USEC_PER_SEC, otherwise a large value can trigger modulo by zero during normalization.
2016-12-20 22:42:12 +01:00
assert_se(calendar_spec_from_string("00:00:2300", &c) < 0);
assert_se(calendar_spec_from_string("00:00:18446744073709551615", &c) < 0);
test-calendarspec: add the test case from oss-fuzz 6886 Before the fix 55a30fd4e8 in this would crash in calendarspec_from_time_t().
2018-03-13 12:51:08 +01:00
assert_se(calendar_spec_from_string("@88588582097858858", &c) == -ERANGE);
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
util-lib: make timestamp generation and parsing reversible (#3869) This patch improves parsing and generation of timestamps and calendar specifications in two ways: - The week day is now always printed in the abbreviated English form, instead of the locale's setting. This makes sure we can always parse the week day again, even if the locale is changed. Given that we don't follow locale settings for printing timestamps in any other way either (for example, we always use 24h syntax in order to make uniform parsing possible), it only makes sense to also stick to a generic, non-localized form for the timestamp, too. - When parsing a timestamp, the local timezone (in its DST or non-DST name) may be specified, in addition to "UTC". Other timezones are still not supported however (not because we wouldn't want to, but mostly because libc offers no nice API for that). In itself this brings no new features, however it ensures that any locally formatted timestamp's timezone is also parsable again. These two changes ensure that the output of format_timestamp() may always be passed to parse_timestamp() and results in the original input. The related flavours for usec/UTC also work accordingly. Calendar specifications are extended in a similar way. The man page is updated accordingly, in particular this removes the claim that timestamps systemd prints wouldn't be parsable by systemd. They are now. The man page previously showed invalid timestamps as examples. This has been removed, as the man page shouldn't be a unit test, where such negative examples would be useful. The man page also no longer mentions the names of internal functions, such as format_timestamp_us() or UNIX error codes such as EINVAL.
2016-08-04 01:04:53 +02:00
test_timestamp();
test-calendarspec: test that hourly timers are incremented properly Apparently this works just fine, so the issue in #4031 is elsewhere.
2016-10-17 06:08:43 +02:00
test_hourly_bug_4031();
util-lib: make timestamp generation and parsing reversible (#3869) This patch improves parsing and generation of timestamps and calendar specifications in two ways: - The week day is now always printed in the abbreviated English form, instead of the locale's setting. This makes sure we can always parse the week day again, even if the locale is changed. Given that we don't follow locale settings for printing timestamps in any other way either (for example, we always use 24h syntax in order to make uniform parsing possible), it only makes sense to also stick to a generic, non-localized form for the timestamp, too. - When parsing a timestamp, the local timezone (in its DST or non-DST name) may be specified, in addition to "UTC". Other timezones are still not supported however (not because we wouldn't want to, but mostly because libc offers no nice API for that). In itself this brings no new features, however it ensures that any locally formatted timestamp's timezone is also parsable again. These two changes ensure that the output of format_timestamp() may always be passed to parse_timestamp() and results in the original input. The related flavours for usec/UTC also work accordingly. Calendar specifications are extended in a similar way. The man page is updated accordingly, in particular this removes the claim that timestamps systemd prints wouldn't be parsable by systemd. They are now. The man page previously showed invalid timestamps as examples. This has been removed, as the man page shouldn't be a unit test, where such negative examples would be useful. The man page also no longer mentions the names of internal functions, such as format_timestamp_us() or UNIX error codes such as EINVAL.
2016-08-04 01:04:53 +02:00
timer: implement calendar time events
2012-11-23 21:37:58 +01:00
return 0;
}
Reference in a new issue Copy permalink