[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/364'
commit 7080e748e5a1d1ba2fe0b7d084394eb6743a5c8e
Merge: 874d2c8601 8b22c80f56
Author: George Kadianakis <desnacked@xxxxxxxxxx>
Date: Mon Apr 19 17:38:16 2021 +0300
Merge remote-tracking branch 'tor-gitlab/mr/364'
changes/bug40365 | 3 +++
src/test/test_connection.c | 18 +++++++++---------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --cc src/test/test_connection.c
index 9c726c07f8,3c24e040ca..87940f71e6
--- a/src/test/test_connection.c
+++ b/src/test/test_connection.c
@@@ -1005,16 -983,17 +1005,16 @@@ static const unsigned int PROXY_HAPROXY
struct testcase_t connection_tests[] = {
CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st),
- 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,
+ CONNECTION_TESTCASE_ARG(download_status, "microdesc", TT_FORK,
test_conn_download_status_st, "microdesc"),
- CONNECTION_TESTCASE_ARG(download_status, TT_FORK,
+ CONNECTION_TESTCASE_ARG(download_status, "ns", TT_FORK,
test_conn_download_status_st, "ns"),
- CONNECTION_TESTCASE_ARG(https_proxy_connect, TT_FORK,
+ CONNECTION_TESTCASE_ARG(https_proxy_connect, "https", TT_FORK,
test_conn_proxy_connect_st, &PROXY_CONNECT_ARG),
- CONNECTION_TESTCASE_ARG(haproxy_proxy_connect, TT_FORK,
+ CONNECTION_TESTCASE_ARG(haproxy_proxy_connect, "haproxy", TT_FORK,
test_conn_proxy_connect_st, &PROXY_HAPROXY_ARG),
//CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair),
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits