tor

commit b7f886beb43c098869742fbf55caef9bb8b702f2
parent a22bfe04bcb106b14e2416e39dc9f43dc82eeba0
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 19 Jan 2021 12:53:44 -0500

Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.3

Diffstat:
A
changes/bug40113
 | 
3
+++
M
src/test/test_connection.c
 | 
13
+++++++------

2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/changes/bug40113 b/changes/bug40113
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+    - Resolve a compilation warning that could occur in test_connection.c.
+      Fixes bug 40113; bugfix on 0.2.9.3-alpha.
diff --git a/src/test/test_connection.c b/src/test/test_connection.c
@@ -616,7 +616,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);
@@ -980,17 +981,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 },
   END_OF_TESTCASES
 };