diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-01-19 20:14:18 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-01-19 20:14:18 -0500 |
| commit | ae3d2a93f0cbf05803d358b2e86de1f79f103669 (patch) | |
| tree | f7866a7ba22d39172e9768875030523eeb736fba /src | |
| parent | f557a7f327d6574018f836e6d7ba767a6082c491 (diff) | |
| parent | 32946e2c9652d28c988466cfc7c3e6ca6007b114 (diff) | |
| download | tor-ae3d2a93f0cbf05803d358b2e86de1f79f103669.tar.gz tor-ae3d2a93f0cbf05803d358b2e86de1f79f103669.zip | |
Merge remote-tracking branch 'twstrike/options_test'
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/test_options.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c index a8b0ba9603..e00c8020fe 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -2308,7 +2308,7 @@ test_options_validate__bandwidth(void *ignored) "RelayBandwidthRate 1000\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - tt_int_op(tdata->opt->RelayBandwidthBurst, OP_EQ, 1000); + tt_u64_op(tdata->opt->RelayBandwidthBurst, OP_EQ, 1000); tor_free(msg); free_options_test_data(tdata); @@ -2316,7 +2316,7 @@ test_options_validate__bandwidth(void *ignored) "RelayBandwidthBurst 1001\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - tt_int_op(tdata->opt->RelayBandwidthRate, OP_EQ, 1001); + tt_u64_op(tdata->opt->RelayBandwidthRate, OP_EQ, 1001); tor_free(msg); free_options_test_data(tdata); @@ -2347,7 +2347,7 @@ test_options_validate__bandwidth(void *ignored) ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - tt_int_op(tdata->opt->BandwidthRate, OP_EQ, 1001); + tt_u64_op(tdata->opt->BandwidthRate, OP_EQ, 1001); tor_free(msg); free_options_test_data(tdata); @@ -2359,7 +2359,7 @@ test_options_validate__bandwidth(void *ignored) ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - tt_int_op(tdata->opt->BandwidthBurst, OP_EQ, 1001); + tt_u64_op(tdata->opt->BandwidthBurst, OP_EQ, 1001); tor_free(msg); free_options_test_data(tdata); @@ -3221,6 +3221,7 @@ test_options_validate__control(void *ignored) "controller as soon as possible.\n"); tor_free(msg); +#ifdef HAVE_SYS_UN_H free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES "ControlSocket unix:/tmp WorldWritable\n" @@ -3282,6 +3283,7 @@ test_options_validate__control(void *ignored) "can reconfigure your Tor. That's bad! You should upgrade your " "Tor controller as soon as possible.\n"); tor_free(msg); +#endif free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES |