commit 33d44dc4ac9d956cc6aeb29dead1053621b7f29f Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 21 15:32:16 2017 -0400 Capture "Result does not fit in tor_timegm()" warnings in util tests Fixes bug 21800; bugfix on 0.2.9.x --- changes/bug21800 | 4 ++++ src/test/test_util.c | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/changes/bug21800 b/changes/bug21800 new file mode 100644 index 000000000..53c20c0fa --- /dev/null +++ b/changes/bug21800 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Capture and detect several "Result does not fit" warnings + in unit tests on platforms with 32-bit time_t. Fixes bug 21800; + bugfix on 0.2.9.3-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index db629bcb6..35fd02b1e 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -635,7 +635,10 @@ test_util_time(void *arg) * time_t */ a_time.tm_year = 2039-1900; #if SIZEOF_TIME_T == 4 + setup_capture_of_logs(LOG_WARN); tt_int_op((time_t) -1,OP_EQ, tor_timegm(&a_time)); + expect_single_log_msg_containing("Result does not fit in tor_timegm"); + teardown_capture_of_logs(); #elif SIZEOF_TIME_T == 8 t_res = 2178252895UL; tt_int_op(t_res, OP_EQ, tor_timegm(&a_time)); @@ -965,7 +968,9 @@ test_util_time(void *arg) strlcpy(timestr, "Wed, 17 Feb 2038 06:13:20 GMT", sizeof(timestr)); t_res = 0; + CAPTURE(); i = parse_rfc1123_time(timestr, &t_res); + CHECK_TIMEGM_WARNING("does not fit in tor_timegm"); tt_int_op(-1,OP_EQ, i); #elif SIZEOF_TIME_T == 8 tt_str_op("Wed, 17 Feb 2038 06:13:20 GMT",OP_EQ, timestr); @@ -1042,7 +1047,9 @@ test_util_time(void *arg) t_res = 0; i = parse_iso_time("2038-02-17 06:13:20", &t_res); #if SIZEOF_TIME_T == 4 + CAPTURE(); tt_int_op(-1,OP_EQ, i); + CHECK_TIMEGM_WARNING("does not fit in tor_timegm"); #elif SIZEOF_TIME_T == 8 tt_int_op(0,OP_EQ, i); tt_int_op(t_res,OP_EQ, (time_t)2150000000UL); @@ -1218,8 +1225,11 @@ test_util_parse_http_time(void *arg) #if SIZEOF_TIME_T == 4 /* parse_http_time should indicate failure on overflow, but it doesn't yet. * Hopefully #18480 will improve the failure semantics in this case. */ + setup_capture_of_logs(LOG_WARN); tt_int_op(0,OP_EQ,parse_http_time("Wed, 17 Feb 2038 06:13:20 GMT", &a_time)); tt_int_op((time_t)-1,OP_EQ, tor_timegm(&a_time)); + expect_single_log_msg_containing("does not fit in tor_timegm"); + teardown_capture_of_logs(); #elif SIZEOF_TIME_T == 8 tt_int_op(0,OP_EQ,parse_http_time("Wed, 17 Feb 2038 06:13:20 GMT", &a_time)); tt_int_op((time_t)2150000000UL,OP_EQ, tor_timegm(&a_time)); @@ -1237,7 +1247,7 @@ test_util_parse_http_time(void *arg) #undef T done: - ; + teardown_capture_of_logs(); } static void