diff options
| author | George Kadianakis <desnacked@riseup.net> | 2020-10-07 13:29:16 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2020-10-07 13:29:16 +0300 |
| commit | 84e825598a8845b34ac0dff2a6d797725c174b19 (patch) | |
| tree | 9a06a219c15c9cb2e877fb2b1ca9051e0aaf95bb /src | |
| parent | 5f61e19d8a4e96be9e8692777d835dde8d1ea7f8 (diff) | |
| parent | 149b7a2418b436bee1be8059e7ccac3d4e5a401a (diff) | |
| download | tor-84e825598a8845b34ac0dff2a6d797725c174b19.tar.gz tor-84e825598a8845b34ac0dff2a6d797725c174b19.zip | |
Merge branch 'maint-0.4.4' into master
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/test_connection.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/test/test_connection.c b/src/test/test_connection.c index 954aeb82e3..178a37adf6 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -617,7 +617,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); @@ -1093,17 +1094,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 }, { "describe", test_conn_describe, TT_FORK, NULL, NULL }, END_OF_TESTCASES |