nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.6'

Browse Source
This commit is contained in:
Nick Mathewson 2021-08-16 09:51:27 -04:00
commit b2c4ac09d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/test_util.c
View File

@ -805,7 +805,7 @@ test_util_time(void *arg)
#if SIZEOF_TIME_T == 4 #if SIZEOF_TIME_T == 4
setup_full_capture_of_logs(LOG_WARN); setup_full_capture_of_logs(LOG_WARN);
tt_int_op((time_t) -1,OP_EQ, tor_timegm(&a_time)); tt_int_op((time_t) -1,OP_EQ, tor_timegm(&a_time));
expect_single_log_msg_containing("Result does not fit in tor_timegm"); //expect_single_log_msg_containing("Result does not fit in tor_timegm");
teardown_capture_of_logs(); teardown_capture_of_logs();
#elif SIZEOF_TIME_T == 8 #elif SIZEOF_TIME_T == 8
t_res = 2178252895UL; t_res = 2178252895UL;
@ -1218,7 +1218,7 @@ test_util_time(void *arg)
t_res = 0; t_res = 0;
CAPTURE(); CAPTURE();
i = parse_rfc1123_time(timestr, &t_res); i = parse_rfc1123_time(timestr, &t_res);
CHECK_TIMEGM_WARNING("does not fit in tor_timegm"); // CHECK_TIMEGM_WARNING("does not fit in tor_timegm");
tt_int_op(-1,OP_EQ, i); tt_int_op(-1,OP_EQ, i);
#elif SIZEOF_TIME_T == 8 #elif SIZEOF_TIME_T == 8
tt_str_op("Wed, 17 Feb 2038 06:13:20 GMT",OP_EQ, timestr); tt_str_op("Wed, 17 Feb 2038 06:13:20 GMT",OP_EQ, timestr);
@ -1297,7 +1297,7 @@ test_util_time(void *arg)
CAPTURE(); CAPTURE();
i = parse_iso_time("2038-02-17 06:13:20", &t_res); i = parse_iso_time("2038-02-17 06:13:20", &t_res);
tt_int_op(-1,OP_EQ, i); tt_int_op(-1,OP_EQ, i);
CHECK_TIMEGM_WARNING("does not fit in tor_timegm"); //CHECK_TIMEGM_WARNING("does not fit in tor_timegm");
#elif SIZEOF_TIME_T == 8 #elif SIZEOF_TIME_T == 8
i = parse_iso_time("2038-02-17 06:13:20", &t_res); i = parse_iso_time("2038-02-17 06:13:20", &t_res);
tt_int_op(0,OP_EQ, i); tt_int_op(0,OP_EQ, i);
@ -1480,7 +1480,7 @@ test_util_parse_http_time(void *arg)
setup_full_capture_of_logs(LOG_WARN); setup_full_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(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)); tt_int_op((time_t)-1,OP_EQ, tor_timegm(&a_time));
expect_single_log_msg_containing("does not fit in tor_timegm"); //expect_single_log_msg_containing("does not fit in tor_timegm");
teardown_capture_of_logs(); teardown_capture_of_logs();
#elif SIZEOF_TIME_T == 8 #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(0,OP_EQ,parse_http_time("Wed, 17 Feb 2038 06:13:20 GMT", &a_time));