nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-gitlab/mr/364'

Browse Source
This commit is contained in:
George Kadianakis 2021-04-19 17:38:16 +03:00
commit 7080e748e5
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug40365 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (tests):
- Fix a bug that prevented some tests from running with the correct names.
Fixes bug 40365; bugfix on 0.4.3.1-alpha.

18
src/test/test_connection.c
View File

@ -992,12 +992,12 @@ test_conn_describe(void *arg)
#define STR(x) #x #define STR(x) #x
/* where arg is an expression (constant, variable, compound expression) */ /* where arg is an expression (constant, variable, compound expression) */
#define CONNECTION_TESTCASE_ARG(name, fork, setup, arg) \ #define CONNECTION_TESTCASE_ARG(name, extra, fork, setup, arg) \
{ #name "_" STR(x), \ { STR(name)"/"extra, \
test_conn_##name, \ test_conn_##name, \
fork, \ (fork), \
&setup, \ &(setup), \
(void *)arg } (void *)(arg) }
#endif /* !defined(COCCI) */ #endif /* !defined(COCCI) */
static const unsigned int PROXY_CONNECT_ARG = PROXY_CONNECT; static const unsigned int PROXY_CONNECT_ARG = PROXY_CONNECT;
@ -1007,14 +1007,14 @@ struct testcase_t connection_tests[] = {
CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st), CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st),
CONNECTION_TESTCASE(get_rsrc, TT_FORK, test_conn_get_rsrc_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"), 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"), 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), 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), 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),