diff options
author | teor <teor@torproject.org> | 2020-02-12 12:22:04 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2020-02-12 12:22:04 +1000 |
commit | ff52205362f5d60c209f298a3e3679bc65bdf539 (patch) | |
tree | 9f5452a584a15cb605c12b5b7d27ce7f93e52579 /src/test/test_config.c | |
parent | 00fe214729b935adc522883fa84b399429fefa74 (diff) | |
parent | 5298113da98f13cfaad4a9ab7b5ac8baa6c37279 (diff) | |
download | tor-ff52205362f5d60c209f298a3e3679bc65bdf539.tar.gz tor-ff52205362f5d60c209f298a3e3679bc65bdf539.zip |
Merge branch 'maint-0.4.1' into maint-0.4.2
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 cbb84e4dcf..ebc0624fb2 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5663,11 +5663,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; } |