[tor-commits] [tor/master] test: Move unit tests to new find address interface

[nickm at torproject.org]

commit 4a41761101bc4bd3614ae309f436015b9c4799da
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jul 14 13:07:53 2020 -0400

    test: Move unit tests to new find address interface
    
    Remove use of router_pick_published_address() and use
    relay_find_addr_to_publish instead.
    
    Related to #40025
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/feature/relay/relay_find_addr.c |  6 +++---
 src/feature/relay/relay_find_addr.h |  5 +++--
 src/test/test_config.c              | 33 +++++++++++++++++----------------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/feature/relay/relay_find_addr.c b/src/feature/relay/relay_find_addr.c
index d685145934..840896f23b 100644
--- a/src/feature/relay/relay_find_addr.c
+++ b/src/feature/relay/relay_find_addr.c
@@ -179,9 +179,9 @@ router_new_address_suggestion(const char *suggestion,
  * Return true on success and addr_out contains the address to use for the
  * given family. On failure to find the address, false is returned and
  * addr_out is set to an AF_UNSPEC address. */
-bool
-relay_find_addr_to_publish(const or_options_t *options, int family,
-                           bool cache_only, tor_addr_t *addr_out)
+MOCK_IMPL(bool,
+relay_find_addr_to_publish, (const or_options_t *options, int family,
+                             bool cache_only, tor_addr_t *addr_out))
 {
   tor_assert(options);
   tor_assert(addr_out);
diff --git a/src/feature/relay/relay_find_addr.h b/src/feature/relay/relay_find_addr.h
index 399ac8dc44..ad147686a5 100644
--- a/src/feature/relay/relay_find_addr.h
+++ b/src/feature/relay/relay_find_addr.h
@@ -19,8 +19,9 @@ void relay_address_new_suggestion(const tor_addr_t *suggested_addr,
                                   const tor_addr_t *peer_addr,
                                   const char *identity_digest);
 
-bool relay_find_addr_to_publish(const or_options_t *options, int family,
-                                bool cache_only, tor_addr_t *addr_out);
+MOCK_DECL(bool, relay_find_addr_to_publish,
+          (const or_options_t *options, int family, bool cache_only,
+           tor_addr_t *addr_out));
 
 bool relay_has_address_set(int family);
 
diff --git a/src/test/test_config.c b/src/test/test_config.c
index a50e6ac927..7496c7c57c 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -3842,16 +3842,17 @@ test_config_default_dir_servers(void *arg)
   or_options_free(opts);
 }
 
-static int mock_router_pick_published_address_result = 0;
+static bool mock_relay_find_addr_to_publish_result = true;
 
-static int
-mock_router_pick_published_address(const or_options_t *options,
-                                   uint32_t *addr, int cache_only)
+static bool
+mock_relay_find_addr_to_publish(const or_options_t *options, int family,
+                                bool cache_only, tor_addr_t *addr_out)
 {
-  (void)options;
-  (void)addr;
-  (void)cache_only;
-  return mock_router_pick_published_address_result;
+  (void) options;
+  (void) family;
+  (void) cache_only;
+  (void) addr_out;
+  return mock_relay_find_addr_to_publish_result;
 }
 
 static int mock_router_my_exit_policy_is_reject_star_result = 0;
@@ -3887,11 +3888,11 @@ test_config_directory_fetch(void *arg)
   or_options_t *options = options_new();
   routerinfo_t routerinfo;
   memset(&routerinfo, 0, sizeof(routerinfo));
-  mock_router_pick_published_address_result = -1;
+  mock_relay_find_addr_to_publish_result = false;
   mock_router_my_exit_policy_is_reject_star_result = 1;
   mock_advertised_server_mode_result = 0;
   mock_router_get_my_routerinfo_result = NULL;
-  MOCK(router_pick_published_address, mock_router_pick_published_address);
+  MOCK(relay_find_addr_to_publish, mock_relay_find_addr_to_publish);
   MOCK(router_my_exit_policy_is_reject_star,
        mock_router_my_exit_policy_is_reject_star);
   MOCK(advertised_server_mode, mock_advertised_server_mode);
@@ -3947,14 +3948,14 @@ test_config_directory_fetch(void *arg)
   options = options_new();
   options->ORPort_set = 1;
 
-  mock_router_pick_published_address_result = -1;
+  mock_relay_find_addr_to_publish_result = false;
   tt_assert(server_mode(options) == 1);
   tt_assert(public_server_mode(options) == 1);
   tt_int_op(dirclient_fetches_from_authorities(options), OP_EQ, 1);
   tt_int_op(networkstatus_consensus_can_use_multiple_directories(options),
             OP_EQ, 0);
 
-  mock_router_pick_published_address_result = 0;
+  mock_relay_find_addr_to_publish_result = true;
   tt_assert(server_mode(options) == 1);
   tt_assert(public_server_mode(options) == 1);
   tt_int_op(dirclient_fetches_from_authorities(options), OP_EQ, 0);
@@ -3968,7 +3969,7 @@ test_config_directory_fetch(void *arg)
   options = options_new();
   options->ORPort_set = 1;
   options->ExitRelay = 1;
-  mock_router_pick_published_address_result = 0;
+  mock_relay_find_addr_to_publish_result = true;
   mock_router_my_exit_policy_is_reject_star_result = 0;
   mock_advertised_server_mode_result = 1;
   mock_router_get_my_routerinfo_result = &routerinfo;
@@ -3983,7 +3984,7 @@ test_config_directory_fetch(void *arg)
             OP_EQ, 0);
 
   options->RefuseUnknownExits = 0;
-  mock_router_pick_published_address_result = 0;
+  mock_relay_find_addr_to_publish_result = true;
   tt_assert(server_mode(options) == 1);
   tt_assert(public_server_mode(options) == 1);
   tt_int_op(dirclient_fetches_from_authorities(options), OP_EQ, 0);
@@ -4000,7 +4001,7 @@ test_config_directory_fetch(void *arg)
   options->DirPort_set = 1;
   options->ORPort_set = 1;
   options->DirCache = 1;
-  mock_router_pick_published_address_result = 0;
+  mock_relay_find_addr_to_publish_result = true;
   mock_router_my_exit_policy_is_reject_star_result = 1;
 
   mock_advertised_server_mode_result = 1;
@@ -4051,7 +4052,7 @@ test_config_directory_fetch(void *arg)
 
  done:
   or_options_free(options);
-  UNMOCK(router_pick_published_address);
+  UNMOCK(relay_find_addr_to_publish);
   UNMOCK(router_get_my_routerinfo);
   UNMOCK(advertised_server_mode);
   UNMOCK(router_my_exit_policy_is_reject_star);