diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-01-19 12:53:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-01-19 12:53:52 -0500 |
| commit | 1cd6baad7ef543ec264790d4db3a3ff1d114d54e (patch) | |
| tree | 3402b2ec1fe77a4d0509efa41208bd6ebc7ca2a1 | |
| parent | 742d18e047678d6aca026b24be016bf24fd0e4c6 (diff) | |
| parent | 9b390a556e5030d67c235806b2c027513fb1679f (diff) | |
| download | tor-1cd6baad7ef543ec264790d4db3a3ff1d114d54e.tar.gz tor-1cd6baad7ef543ec264790d4db3a3ff1d114d54e.zip | |
Merge branch 'maint-0.4.3' into release-0.4.3
| -rw-r--r-- | changes/bug40113 | 3 | ||||
| -rw-r--r-- | src/test/test_connection.c | 13 |
2 files changed, 10 insertions, 6 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 7ed831f7d8..05f7009bf4 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -616,7 +616,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); @@ -980,17 +981,17 @@ 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), - CONNECTION_TESTCASE_ARG(download_status, TT_FORK, - test_conn_download_status_st, FLAV_NS), + CONNECTION_TESTCASE_ARG(download_status, TT_FORK, + test_conn_download_status_st, "microdesc"), + CONNECTION_TESTCASE_ARG(download_status, TT_FORK, + test_conn_download_status_st, "ns"), CONNECTION_TESTCASE_ARG(https_proxy_connect, TT_FORK, test_conn_proxy_connect_st, &PROXY_CONNECT_ARG), CONNECTION_TESTCASE_ARG(haproxy_proxy_connect, TT_FORK, test_conn_proxy_connect_st, &PROXY_HAPROXY_ARG), -//CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair), + //CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair), { "failed_orconn_tracker", test_failed_orconn_tracker, TT_FORK, NULL, NULL }, END_OF_TESTCASES }; |