diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-03-12 13:42:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-03-12 13:42:42 -0400 |
| commit | 3e42004e54054b111068e0a83825b95b7c8ff585 (patch) | |
| tree | fbd7594fae741cfc2f360f908ed7bdf23d90f98e /src/test/test_options.c | |
| parent | e03bb35f90f28ae21b9c9e80b5af9a689af9e1dc (diff) | |
| parent | 8dc7ad1275a53cfe490128e7fb25b759dd7d88b5 (diff) | |
| download | tor-3e42004e54054b111068e0a83825b95b7c8ff585.tar.gz tor-3e42004e54054b111068e0a83825b95b7c8ff585.zip | |
Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3
Diffstat (limited to 'src/test/test_options.c')
| -rw-r--r-- | src/test/test_options.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c index 636d3c0e54..9cd1d11d29 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -490,7 +490,8 @@ test_options_validate__uname_for_server(void *ignored) #endif options_test_data_t *tdata = get_options_test_data( - "ORPort 127.0.0.1:5555"); + "ORPort 127.0.0.1:5555\n" + "ContactInfo nobody@example.com"); setup_capture_of_logs(LOG_WARN); MOCK(get_uname, fixed_get_uname); @@ -636,9 +637,11 @@ test_options_validate__contactinfo(void *ignored) ret = options_validate(NULL, tdata->opt, &msg); tt_int_op(ret, OP_EQ, 0); expect_log_msg( - "Your ContactInfo config option is not" - " set. Please consider setting it, so we can contact you if your" - " server is misconfigured or something else goes wrong.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); free_options_test_data(tdata); @@ -648,9 +651,11 @@ test_options_validate__contactinfo(void *ignored) ret = options_validate(NULL, tdata->opt, &msg); tt_int_op(ret, OP_EQ, 0); expect_no_log_msg( - "Your ContactInfo config option is not" - " set. Please consider setting it, so we can contact you if your" - " server is misconfigured or something else goes wrong.\n"); + "Your ContactInfo config option is not set. Please strongly " + "consider setting it, so we can contact you if your relay is " + "misconfigured, end-of-life, or something else goes wrong. It " + "is also possible that your relay might get rejected from the " + "network due to a missing valid contact address.\n"); tor_free(msg); done: |