diff options
| author | Fergus Dall <fergus@beware.dropbear.id.au> | 2016-01-12 18:09:16 +1030 |
|---|---|---|
| committer | Fergus Dall <fergus@beware.dropbear.id.au> | 2016-01-12 22:01:46 +1030 |
| commit | 9e5a6f02937912fbb2a1582aae99186310192fa1 (patch) | |
| tree | 3e12c83ba634daec960c1d3d5e5d8f4ebcd89def /src/test/test_status.c | |
| parent | 16840e52e594e221069efc9bf7b65ebfb5e2d639 (diff) | |
| download | tor-9e5a6f02937912fbb2a1582aae99186310192fa1.tar.gz tor-9e5a6f02937912fbb2a1582aae99186310192fa1.zip | |
Stop log_heartbeat test from failing in timezones with non-integer offsets
Instead of comparing the end of the time string against a constant,
compare it to the output of format_local_iso_time when given the
correct input.
Diffstat (limited to 'src/test/test_status.c')
| -rw-r--r-- | src/test/test_status.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/test/test_status.c b/src/test/test_status.c index 57d69b1cc3..84a0f6c024 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -714,9 +714,11 @@ NS(logv)(int severity, log_domain_mask_t domain, tt_str_op(va_arg(ap, char *), OP_EQ, "0 kB"); /* acc_used */ tt_str_op(va_arg(ap, char *), OP_EQ, "0 kB"); /* acc_max */ tt_str_op(va_arg(ap, char *), OP_EQ, "max"); /* acc_rule */ - /* format_local_iso_time uses local tz, just check mins and secs. */ - tt_ptr_op(strstr(va_arg(ap, char *), ":01:00"), - OP_NE, NULL); /* end_buf */ + /* format_local_iso_time uses local tz, so we can't just compare + * the string against a constant */ + char datetime[ISO_TIME_LEN+1]; + format_local_iso_time(datetime, 60); + tt_str_op(va_arg(ap, char *), OP_EQ, datetime); /* end_buf */ tt_str_op(va_arg(ap, char *), OP_EQ, "0:01 hours"); /* remaining */ break; case 2: |