diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-01-19 12:53:30 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-01-19 12:53:30 -0500 |
| commit | faf7b550e740642e060518adc6a8624b036ed8e2 (patch) | |
| tree | fd4d726a3945467100d0f822155fa3d5acf33eb6 | |
| parent | 2d5b21598ea04b3beb59cb678d8b438b27c45ee1 (diff) | |
| parent | 020e8e41c676370de66d3ddf459700867ed454cd (diff) | |
| download | tor-faf7b550e740642e060518adc6a8624b036ed8e2.tar.gz tor-faf7b550e740642e060518adc6a8624b036ed8e2.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5
| -rw-r--r-- | changes/bug40113 | 3 | ||||
| -rw-r--r-- | src/test/test_connection.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/changes/bug40113 b/changes/bug40113 new file mode 100644 index 0000000000..adf4634097 --- /dev/null +++ b/changes/bug40113 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Resolve a compilation warning that could occur in test_connection.c. + Fixes bug 40113; bugfix on 0.2.9.3-alpha. diff --git a/src/test/test_connection.c b/src/test/test_connection.c index ebe7c6d36f..6f716f5758 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -592,7 +592,8 @@ test_conn_download_status(void *arg) connection_t *ap_conn = NULL; const struct testcase_t *tc = arg; - consensus_flavor_t usable_flavor = (consensus_flavor_t)tc->setup_data; + consensus_flavor_t usable_flavor = + networkstatus_parse_flavor_name((const char*) tc->setup_data); /* The "other flavor" trick only works if there are two flavors */ tor_assert(N_CONSENSUS_FLAVORS == 2); @@ -893,9 +894,9 @@ struct testcase_t connection_tests[] = { CONNECTION_TESTCASE(get_rend, TT_FORK, test_conn_get_rend_st), CONNECTION_TESTCASE(get_rsrc, TT_FORK, test_conn_get_rsrc_st), CONNECTION_TESTCASE_ARG(download_status, TT_FORK, - test_conn_download_status_st, FLAV_MICRODESC), + test_conn_download_status_st, "microdesc"), CONNECTION_TESTCASE_ARG(download_status, TT_FORK, - test_conn_download_status_st, FLAV_NS), + test_conn_download_status_st, "ns"), //CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair), { "failed_orconn_tracker", test_failed_orconn_tracker, TT_FORK, NULL, NULL }, END_OF_TESTCASES |