diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-30 09:19:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:06:20 -0500 |
| commit | 13315812e857f37828475101cc8d5acb63403c0e (patch) | |
| tree | 736919725fbadd05a7e813152d14df2b07d88aa2 | |
| parent | 2c8c58ab2fe7d452d06abdb7328be7eae658bcc0 (diff) | |
| download | tor-13315812e857f37828475101cc8d5acb63403c0e.tar.gz tor-13315812e857f37828475101cc8d5acb63403c0e.zip | |
Repair unit test for tiny-network case.
The test assumed that the old rules about handling small max_sample
were in effect, and didn't actually handle that case very well
anyway.
| -rw-r--r-- | src/test/test_entrynodes.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 0921e2011e..5fff1d6d22 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -1524,7 +1524,7 @@ test_entry_guard_expand_sample_small_net(void *arg) /* Fun corner case: not enough guards to make up our whole sample size. */ SMARTLIST_FOREACH(big_fake_net_nodes, node_t *, n, { - if (n_sl_idx >= 40) { + if (n_sl_idx >= 15) { tor_free(n->rs); tor_free(n->md); tor_free(n); @@ -1536,8 +1536,9 @@ test_entry_guard_expand_sample_small_net(void *arg) entry_guard_t *guard = entry_guards_expand_sample(gs); tt_assert(guard); // the last guard returned -- some guard was added. - tt_int_op(smartlist_len(gs->sampled_entry_guards), OP_GT, 0); - tt_int_op(smartlist_len(gs->sampled_entry_guards), OP_LT, 10); + // half the nodes are guards, so we have 8 guards left. The set + // is small, so we sampled everything. + tt_int_op(smartlist_len(gs->sampled_entry_guards), OP_EQ, 8); tt_int_op(num_reachable_filtered_guards(gs, NULL), OP_EQ, 0); done: guard_selection_free(gs); |