diff options
author | teor <teor@torproject.org> | 2020-02-12 12:21:57 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2020-02-12 12:21:57 +1000 |
commit | 5298113da98f13cfaad4a9ab7b5ac8baa6c37279 (patch) | |
tree | a85d0e8f6be3c4195f538592718d7c7ef5e2b612 /src/test/test_config.c | |
parent | 0ff3e8f4a0fd5b661e999c0a81ceb1c55e7456c6 (diff) | |
parent | b9c7c61ea5233854ff83257a8bc530b7e0a50351 (diff) | |
download | tor-5298113da98f13cfaad4a9ab7b5ac8baa6c37279.tar.gz tor-5298113da98f13cfaad4a9ab7b5ac8baa6c37279.zip |
Merge branch 'maint-0.3.5' into maint-0.4.1
Diffstat (limited to 'src/test/test_config.c')
-rw-r--r-- | src/test/test_config.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/test/test_config.c b/src/test/test_config.c index 85216f4a40..3d49086713 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5621,11 +5621,27 @@ test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) static void test_config_check_bridge_distribution_setting_valid(void *arg) { - int ret = check_bridge_distribution_setting("https"); - (void)arg; - tt_int_op(ret, OP_EQ, 0); + // Check all the possible values we support right now. + tt_int_op(check_bridge_distribution_setting("none"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("any"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("https"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("email"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("moat"), OP_EQ, 0); + + // Check all the possible values we support right now with weird casing. + tt_int_op(check_bridge_distribution_setting("NoNe"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("anY"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("hTTps"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("emAIl"), OP_EQ, 0); + tt_int_op(check_bridge_distribution_setting("moAt"), OP_EQ, 0); + + // Invalid values. + tt_int_op(check_bridge_distribution_setting("x\rx"), OP_EQ, -1); + tt_int_op(check_bridge_distribution_setting("x\nx"), OP_EQ, -1); + tt_int_op(check_bridge_distribution_setting("\t\t\t"), OP_EQ, -1); + done: return; } |