nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3

Browse Source
This commit is contained in:
Nick Mathewson 2020-03-12 13:42:42 -04:00
commit 3e42004e54
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/test/test_options.c
View File

@ -490,7 +490,8 @@ test_options_validate__uname_for_server(void *ignored)
#endif #endif
options_test_data_t *tdata = get_options_test_data( 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); setup_capture_of_logs(LOG_WARN);
MOCK(get_uname, fixed_get_uname); MOCK(get_uname, fixed_get_uname);
@ -636,9 +637,11 @@ test_options_validate__contactinfo(void *ignored)
ret = options_validate(NULL, tdata->opt, &msg); ret = options_validate(NULL, tdata->opt, &msg);
tt_int_op(ret, OP_EQ, 0); tt_int_op(ret, OP_EQ, 0);
expect_log_msg( expect_log_msg(
"Your ContactInfo config option is not" "Your ContactInfo config option is not set. Please strongly "
" set. Please consider setting it, so we can contact you if your" "consider setting it, so we can contact you if your relay is "
" server is misconfigured or something else goes wrong.\n"); "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); tor_free(msg);
free_options_test_data(tdata); free_options_test_data(tdata);
@ -648,9 +651,11 @@ test_options_validate__contactinfo(void *ignored)
ret = options_validate(NULL, tdata->opt, &msg); ret = options_validate(NULL, tdata->opt, &msg);
tt_int_op(ret, OP_EQ, 0); tt_int_op(ret, OP_EQ, 0);
expect_no_log_msg( expect_no_log_msg(
"Your ContactInfo config option is not" "Your ContactInfo config option is not set. Please strongly "
" set. Please consider setting it, so we can contact you if your" "consider setting it, so we can contact you if your relay is "
" server is misconfigured or something else goes wrong.\n"); "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); tor_free(msg);
done: done: