diff options
author | Lennart Poettering <lennart@poettering.net> | 2017-02-02 18:30:29 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2017-02-02 20:12:31 +0100 |
commit | 1bb4b028a380d74cff6399ea1d8ffcf1b2f122bc (patch) | |
tree | 041f20a932fbf9d318cf5484bf5e22e8cddae5bc /src/test/test-time.c | |
parent | c477ff141b875a2a98c90514b6bf23f0436d1f73 (diff) |
time-util: refuse formatting/parsing times that we can't store
usec_t is always 64bit, which means it can cover quite a number of
years. However, 4 digit year display and glibc limitations around time_t
limit what we can actually parse and format. Let's make this explicit,
so that we never end up formatting dates we can#t parse and vice versa.
Note that this is really just about formatting/parsing. Internal
calculations with times outside of the formattable range are not
affected.
Diffstat (limited to 'src/test/test-time.c')
-rw-r--r-- | src/test/test-time.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/src/test/test-time.c b/src/test/test-time.c index 8259491813..911282bf0c 100644 --- a/src/test/test-time.c +++ b/src/test/test-time.c @@ -17,9 +17,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include "random-util.h" +#include "string-util.h" #include "strv.h" #include "time-util.h" -#include "random-util.h" static void test_parse_sec(void) { usec_t u; @@ -248,6 +249,30 @@ static void test_format_timestamp(void) { } } +static void test_format_timestamp_utc_one(usec_t t, const char *result) { + char buf[FORMAT_TIMESTAMP_MAX]; + + assert_se(!format_timestamp_utc(buf, sizeof(buf), t) == !result); + + if (result) + assert_se(streq(result, buf)); +} + +static void test_format_timestamp_utc(void) { + test_format_timestamp_utc_one(0, NULL); + test_format_timestamp_utc_one(1, "Thu 1970-01-01 00:00:00 UTC"); + test_format_timestamp_utc_one(USEC_PER_SEC, "Thu 1970-01-01 00:00:01 UTC"); + +#if SIZEOF_TIME_T == 8 + test_format_timestamp_utc_one(USEC_TIMESTAMP_FORMATTABLE_MAX, "Thu 9999-12-30 23:59:59 UTC"); +#elif SIZEOF_TIME_T == 4 + test_format_timestamp_utc_one(USEC_TIMESTAMP_FORMATTABLE_MAX, "Tue 2038-01-19 03:14:07 UTC"); +#endif + + test_format_timestamp_utc_one(USEC_TIMESTAMP_FORMATTABLE_MAX+1, NULL); + test_format_timestamp_utc_one(USEC_INFINITY, NULL); +} + int main(int argc, char *argv[]) { uintmax_t x; @@ -262,6 +287,7 @@ int main(int argc, char *argv[]) { test_usec_add(); test_usec_sub(); test_format_timestamp(); + test_format_timestamp_utc(); /* Ensure time_t is signed */ assert_cc((time_t) -1 < (time_t) 1); |