diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-29 14:28:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:06:19 -0500 |
| commit | 6c3f555a8c4d33b8f9dcdc55c03bee8170feb65f (patch) | |
| tree | a941038a487506de1e23d75e836eb7bd94889357 | |
| parent | 80fa404625b757cbde07be76abf848efadab7c46 (diff) | |
| download | tor-6c3f555a8c4d33b8f9dcdc55c03bee8170feb65f.tar.gz tor-6c3f555a8c4d33b8f9dcdc55c03bee8170feb65f.zip | |
Re-enable some disabled tests about switching guard_selections
| -rw-r--r-- | src/test/test_entrynodes.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 6a3048b338..e3a9d18daa 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -1276,18 +1276,18 @@ test_entry_guard_get_guard_selection_by_name(void *arg) tt_assert(gs3 != NULL); tt_assert(gs3 != gs2); tt_assert(gs3 != gs1); - // XXXX prop271 re-enable this. tt_assert(gs3 == get_guard_selection_info()); + tt_assert(gs3 == get_guard_selection_info()); -#if 0 or_options_t *options = get_options_mutable(); options->UseDeprecatedGuardAlgorithm = 1; - gs4 = get_guard_selection_info(); + update_guard_selection_choice(options); + guard_selection_t *gs4 = get_guard_selection_info(); tt_assert(gs4 != gs3); - tt_assert(gs4 == get_guard_selection_by_name("legacy", 1)); + tt_assert(gs4 == get_guard_selection_by_name("legacy", GS_TYPE_LEGACY, 1)); options->UseDeprecatedGuardAlgorithm = 0; + update_guard_selection_choice(options); tt_assert(gs3 == get_guard_selection_info()); -#endif done: entry_guards_free_all(); |