nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update expected log messages in tests to new format.

Browse Source
This commit is contained in:
Nick Mathewson 2020-03-05 10:28:06 -05:00 committed by David Goulet
parent d421050f3a
commit 8aacd78e14
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/test/test_hs_config.c
View File

@ -62,8 +62,9 @@ test_invalid_service(void *arg)
setup_full_capture_of_logs(LOG_WARN); setup_full_capture_of_logs(LOG_WARN);
ret = helper_config_service(conf, 1); ret = helper_config_service(conf, 1);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
expect_log_msg_containing("HiddenServiceAllowUnknownPorts must be " expect_log_msg_containing("Could not parse "
"between 0 and 1, not 2"); "HiddenServiceAllowUnknownPorts: Unrecognized "
"value 2. Allowed values are 0 and 1.");
teardown_capture_of_logs(); teardown_capture_of_logs();
} }
@ -76,8 +77,9 @@ test_invalid_service(void *arg)
setup_full_capture_of_logs(LOG_WARN); setup_full_capture_of_logs(LOG_WARN);
ret = helper_config_service(conf, 1); ret = helper_config_service(conf, 1);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
expect_log_msg_containing("HiddenServiceDirGroupReadable must be " expect_log_msg_containing("Could not parse "
"between 0 and 1, not 2"); "HiddenServiceDirGroupReadable: "
"Unrecognized value 2.");
teardown_capture_of_logs(); teardown_capture_of_logs();
} }
@ -90,8 +92,9 @@ test_invalid_service(void *arg)
setup_full_capture_of_logs(LOG_WARN); setup_full_capture_of_logs(LOG_WARN);
ret = helper_config_service(conf, 1); ret = helper_config_service(conf, 1);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
expect_log_msg_containing("HiddenServiceMaxStreamsCloseCircuit must " expect_log_msg_containing("Could not parse "
"be between 0 and 1, not 2"); "HiddenServiceMaxStreamsCloseCircuit: "
"Unrecognized value 2");
teardown_capture_of_logs(); teardown_capture_of_logs();
} }
@ -228,8 +231,8 @@ test_invalid_service_v2(void *arg)
setup_full_capture_of_logs(LOG_WARN); setup_full_capture_of_logs(LOG_WARN);
ret = helper_config_service(conf, validate_only); ret = helper_config_service(conf, validate_only);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
expect_log_msg_containing("HiddenServiceNumIntroductionPoints should " expect_log_msg_containing("HiddenServiceNumIntroductionPoints must "
"be between 0 and 10, not 11"); "be between 0 and 10, not 11.");
teardown_capture_of_logs(); teardown_capture_of_logs();
} }
@ -243,8 +246,9 @@ test_invalid_service_v2(void *arg)
setup_full_capture_of_logs(LOG_WARN); setup_full_capture_of_logs(LOG_WARN);
ret = helper_config_service(conf, validate_only); ret = helper_config_service(conf, validate_only);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
expect_log_msg_containing("HiddenServiceNumIntroductionPoints should " expect_log_msg_containing("Could not parse "
"be between 0 and 10, not -1"); "HiddenServiceNumIntroductionPoints: "
"Integer -1 is malformed or out of bounds.");
teardown_capture_of_logs(); teardown_capture_of_logs();
} }
@ -532,9 +536,10 @@ test_dos_parameters(void *arg)
setup_full_capture_of_logs(LOG_WARN); setup_full_capture_of_logs(LOG_WARN);
ret = helper_config_service(conf, 0); ret = helper_config_service(conf, 0);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
expect_log_msg_containing("HiddenServiceEnableIntroDoSRatePerSec must " expect_log_msg_containing("Could not parse "
"be between 0 and 2147483647, " "HiddenServiceEnableIntroDoSRatePerSec: "
"not 137438953472"); "Integer 137438953472 is malformed or out of "
"bounds.");
teardown_capture_of_logs(); teardown_capture_of_logs();
} }
@ -551,9 +556,10 @@ test_dos_parameters(void *arg)
setup_full_capture_of_logs(LOG_WARN); setup_full_capture_of_logs(LOG_WARN);
ret = helper_config_service(conf, 0); ret = helper_config_service(conf, 0);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
expect_log_msg_containing("HiddenServiceEnableIntroDoSBurstPerSec must " expect_log_msg_containing("Could not parse "
"be between 0 and 2147483647, " "HiddenServiceEnableIntroDoSBurstPerSec: "
"not 274877906944"); "Integer 274877906944 is malformed or out "
"of bounds.");
teardown_capture_of_logs(); teardown_capture_of_logs();
} }
@ -588,8 +594,9 @@ test_dos_parameters(void *arg)
setup_full_capture_of_logs(LOG_WARN); setup_full_capture_of_logs(LOG_WARN);
ret = helper_config_service(conf, 0); ret = helper_config_service(conf, 0);
tt_int_op(ret, OP_EQ, -1); tt_int_op(ret, OP_EQ, -1);
expect_log_msg_containing("HiddenServiceEnableIntroDoSRatePerSec must be " expect_log_msg_containing("Could not parse "
"between 0 and 2147483647, not -1"); "HiddenServiceEnableIntroDoSRatePerSec: "
"Integer -1 is malformed or out of bounds.");
teardown_capture_of_logs(); teardown_capture_of_logs();
} }