diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-04-09 13:51:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-04-09 13:51:44 -0400 |
| commit | c28cdcc9bf5df9ed6479881a1fc4124a7b7a2676 (patch) | |
| tree | 585660b237c010fe11a8d339b71bba31daa67244 /src/test/test_util.c | |
| parent | 16041d791873dc063a625e09fb62206d8ab2e6f4 (diff) | |
| parent | ffdca3dd14ceb0adacc290c3207391c9810b9fbe (diff) | |
| download | tor-c28cdcc9bf5df9ed6479881a1fc4124a7b7a2676.tar.gz tor-c28cdcc9bf5df9ed6479881a1fc4124a7b7a2676.zip | |
Merge branch 'maint-0.4.0'
Diffstat (limited to 'src/test/test_util.c')
| -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 fbb8ca2bf1..61e41e9a9b 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)); |