Commit 98dff5df authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.3' into maint-0.3.4

parents 529faef2 250e0fc1

src/test/test_entrynodes.c

+6 −0
Original line number Diff line number Diff line
@@ -1150,6 +1150,7 @@ test_entry_guard_update_from_consensus_status(void *arg) 
  for (i = 0; i < 5; ++i) {

    entry_guard_t *g = smartlist_get(gs->sampled_entry_guards, i);

    node_t *n = (node_t*) bfn_mock_node_get_by_id(g->identity);

    tt_assert(n);

    n->is_possible_guard = 0;

  }
@@ -1188,6 +1189,7 @@ test_entry_guard_update_from_consensus_status(void *arg) 
  {

    entry_guard_t *g = smartlist_get(gs->sampled_entry_guards, 0);

    node_t *n = (node_t*) bfn_mock_node_get_by_id(g->identity);

    tt_assert(n);

    n->is_possible_guard = 1;

  }

  {
@@ -1195,6 +1197,7 @@ test_entry_guard_update_from_consensus_status(void *arg) 
     */

    entry_guard_t *g = smartlist_get(gs->sampled_entry_guards, 5);

    node_t *n = (node_t*) bfn_mock_node_get_by_id(g->identity);

    tt_assert(n);

    smartlist_remove(big_fake_net_nodes, n);

    test_node_free(n);

  }
@@ -1251,6 +1254,7 @@ test_entry_guard_update_from_consensus_repair(void *arg) 
    /* these will get a date. */

    entry_guard_t *g = smartlist_get(gs->sampled_entry_guards, i);

    node_t *n = (node_t*) bfn_mock_node_get_by_id(g->identity);

    tt_assert(n);

    n->is_possible_guard = 0;

    g->currently_listed = 0;

  }
@@ -1316,6 +1320,7 @@ test_entry_guard_update_from_consensus_remove(void *arg) 
  {

    entry_guard_t *g = smartlist_get(gs->sampled_entry_guards, 0);

    node_t *n = (node_t*) bfn_mock_node_get_by_id(g->identity);

    tt_assert(n);

    n->is_possible_guard = 0;

    g->currently_listed = 0;

    g->unlisted_since_date = one_day_ago;
@@ -1325,6 +1330,7 @@ test_entry_guard_update_from_consensus_remove(void *arg) 
  {

    entry_guard_t *g = smartlist_get(gs->sampled_entry_guards, 1);

    node_t *n = (node_t*) bfn_mock_node_get_by_id(g->identity);

    tt_assert(n);

    n->is_possible_guard = 0;

    g->currently_listed = 0;

    g->unlisted_since_date = one_year_ago;