[tor-commits] [tor/master] Clean up the CONNECTION_TESTCASE_ARG macro.

[asn at torproject.org]

commit 8b22c80f5638f8d5381b9cf145f24d8f71852f10
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 13 17:34:03 2021 -0400

    Clean up the CONNECTION_TESTCASE_ARG macro.
---
 changes/bug40365           |  3 +++
 src/test/test_connection.c | 18 +++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/changes/bug40365 b/changes/bug40365
new file mode 100644
index 0000000000..e4ee7b3b90
--- /dev/null
+++ b/changes/bug40365
@@ -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.
diff --git a/src/test/test_connection.c b/src/test/test_connection.c
index b1252864f5..3c24e040ca 100644
--- a/src/test/test_connection.c
+++ b/src/test/test_connection.c
@@ -970,12 +970,12 @@ test_failed_orconn_tracker(void *arg)
 
 #define STR(x) #x
 /* where arg is an expression (constant, variable, compound expression) */
-#define CONNECTION_TESTCASE_ARG(name, fork, setup, arg)                 \
-  { #name "_" STR(x),                                                   \
+#define CONNECTION_TESTCASE_ARG(name, extra, fork, setup, arg)          \
+  { STR(name)"/"extra,                                                  \
       test_conn_##name,                                                 \
-      fork,                                                             \
-      &setup,                                                           \
-      (void *)arg }
+      (fork),                                                           \
+      &(setup),                                                         \
+      (void *)(arg) }
 #endif /* !defined(COCCI) */
 
 static const unsigned int PROXY_CONNECT_ARG = PROXY_CONNECT;
@@ -986,14 +986,14 @@ 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,
+  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),