Commit 149b7a24 authored by George Kadianakis's avatar George Kadianakis
Browse files

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

parents b6429430 f5ddc456

changes/bug40113

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/test/test_connection.c

+7 −6
Original line number Diff line number Diff line
@@ -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);
@@ -986,9 +987,9 @@ struct testcase_t connection_tests[] = { 
  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),

                          test_conn_download_status_st, "microdesc"),

  CONNECTION_TESTCASE_ARG(download_status,  TT_FORK,

                          test_conn_download_status_st, FLAV_NS),

                          test_conn_download_status_st, "ns"),



  CONNECTION_TESTCASE_ARG(https_proxy_connect,   TT_FORK,

                          test_conn_proxy_connect_st, &PROXY_CONNECT_ARG),