[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/maint-0.4.4] Merge branch 'bug40133_035' into bug40133_043
commit f5ddc456472ed9198cda186e59239b5f7558c799
Merge: beffad8529 79d7773968
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Mon Sep 28 10:37:14 2020 -0400
Merge branch 'bug40133_035' into bug40133_043
changes/bug40113 | 3 +++
src/test/test_connection.c | 13 +++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --cc src/test/test_connection.c
index 7ed831f7d8,6f716f5758..05f7009bf4
--- a/src/test/test_connection.c
+++ b/src/test/test_connection.c
@@@ -979,18 -893,11 +980,18 @@@ 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,
- 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(func_suffix, TT_FORK, setup_func_pair),
+
+ 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
};
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits