]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Fix a bug in connection/download_status.. tests
authorNick Mathewson <nickm@torproject.org>
Thu, 8 Sep 2016 14:48:22 +0000 (10:48 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 Sep 2016 14:48:22 +0000 (10:48 -0400)
src/test/test_connection.c

index bf95b0b59fc8b783fe6ca86368a8d3e6325a4acb..92f1f68bcfa1493d5cb9e0e7eece15177fdf4b87 100644 (file)
@@ -340,10 +340,7 @@ test_conn_get_rsrc_teardown(const struct testcase_t *tc, void *arg)
 static void *
 test_conn_download_status_setup(const struct testcase_t *tc)
 {
-  (void)tc;
-
-  /* Don't return NULL, that causes the test to fail */
-  return (void*)"ok";
+  return (void*)tc;
 }
 
 static int
@@ -655,7 +652,8 @@ test_conn_download_status(void *arg)
   dir_connection_t *conn4 = NULL;
   connection_t *ap_conn = NULL;
 
-  consensus_flavor_t usable_flavor = (consensus_flavor_t)arg;
+  const struct testcase_t *tc = arg;
+  consensus_flavor_t usable_flavor = (consensus_flavor_t)tc->setup_data;
 
   /* The "other flavor" trick only works if there are two flavors */
   tor_assert(N_CONSENSUS_FLAVORS == 2);