aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_dir.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-09-07 17:48:21 -0400
committerNick Mathewson <nickm@torproject.org>2011-09-07 17:48:21 -0400
commit9bdde8902716bf923a78d8c287acadb0c4d2ffcd (patch)
tree4e2f9643bf4cace07909e7cef78a8db4cc43b872 /src/test/test_dir.c
parentd10ae9c02808c10b19bca66cdc1972616b2b6646 (diff)
downloadtor-9bdde8902716bf923a78d8c287acadb0c4d2ffcd.tar
tor-9bdde8902716bf923a78d8c287acadb0c4d2ffcd.tar.gz
Make the unit tests pass again after the bug2003 fix
Diffstat (limited to 'src/test/test_dir.c')
-rw-r--r--src/test/test_dir.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 8fd94289a..8a0fe9a67 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");
@@ -1301,7 +1305,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 }