diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-10-07 16:43:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-07 16:43:45 -0400 |
| commit | 1ec22eac4bf20424624fe2ef2151ff57687912de (patch) | |
| tree | 6612e36f5a3c437278535e5f54a753d8d1b6a765 /src/test | |
| parent | 8b0ee60fe7752f4894fff8334eff786e80941302 (diff) | |
| parent | 9bdde8902716bf923a78d8c287acadb0c4d2ffcd (diff) | |
| download | tor-1ec22eac4bf20424624fe2ef2151ff57687912de.tar.gz tor-1ec22eac4bf20424624fe2ef2151ff57687912de.zip | |
Merge remote-tracking branch 'public/bug2003_nm'
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_dir.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 04ca29a9fb..205d7b577c 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -7,10 +7,12 @@ #define DIRSERV_PRIVATE #define DIRVOTE_PRIVATE #define ROUTER_PRIVATE +#define HIBERNATE_PRIVATE #include "or.h" #include "directory.h" #include "dirserv.h" #include "dirvote.h" +#include "hibernate.h" #include "networkstatus.h" #include "router.h" #include "routerlist.h" @@ -85,6 +87,8 @@ test_dir_formats(void) test_assert(pk1 && pk2 && pk3); + hibernate_set_state_for_testing_(HIBERNATE_STATE_LIVE); + get_platform_str(platform, sizeof(platform)); r1 = tor_malloc_zero(sizeof(routerinfo_t)); r1->address = tor_strdup("18.244.0.1"); @@ -1303,7 +1307,7 @@ test_dir_v3_networkstatus(void) } #define DIR_LEGACY(name) \ - { #name, legacy_test_helper, 0, &legacy_setup, test_dir_ ## name } + { #name, legacy_test_helper, TT_FORK, &legacy_setup, test_dir_ ## name } #define DIR(name) \ { #name, test_dir_##name, 0, NULL, NULL } |