diff options
author | Nick Mathewson <nickm@torproject.org> | 2019-04-09 13:49:58 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2019-04-09 13:49:58 -0400 |
commit | ffdca3dd14ceb0adacc290c3207391c9810b9fbe (patch) | |
tree | f5fe7a9e06af4ba668ceb9df4874b55e6e30e242 | |
parent | c7cf49dc3cce42a77d32011599780360658b1fc9 (diff) | |
parent | 9f3f99938e441c09c1b3bf64510b8fb682dba007 (diff) | |
download | tor-ffdca3dd14ceb0adacc290c3207391c9810b9fbe.tar.gz tor-ffdca3dd14ceb0adacc290c3207391c9810b9fbe.zip |
Merge branch 'bug29922_035' into maint-0.4.0
-rw-r--r-- | src/test/test_util.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c index a473ed1e7b..f1ffae7af8 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -728,13 +728,6 @@ test_util_time(void *arg) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \ CHECK_TIMEGM_WARNING("Out-of-range argument to tor_timegm") -#define CHECK_POSSIBLE_TIMEGM_ARG_OUT_OF_RANGE(msg) \ - do { \ - if (mock_saved_log_n_entries()) { \ - expect_single_log_msg_containing("Out-of-range argument");\ - } \ - teardown_capture_of_logs(); \ - } while (0) /* year */ @@ -923,7 +916,7 @@ test_util_time(void *arg) t_res = -1; CAPTURE(); tor_gmtime_r(&t_res, &b_time); - CHECK_POSSIBLE_TIMEGM_ARG_OUT_OF_RANGE(); + CHECK_POSSIBLE_EINVAL(); tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1969-1900)); |