Initialize networking _before_ initializing libevent in the tests

This prevents WSANOTINITIALISED errors and fixes bug 18668. Bugfix
on 0.2.8.1-alpha -- 1bac468882 specifically.
This commit is contained in:
Nick Mathewson 2016-05-16 14:30:04 -04:00
parent 6cc3397e26
commit 0f9b0b8bfe
2 changed files with 5 additions and 1 deletions

3
changes/bug18668 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (tests):
- Avoid "WSANOTINITIALISED" warnings in the unit tests. Fixes bug 18668;
bugfix on 0.2.8.1-alpha.

View File

@ -242,6 +242,8 @@ main(int c, const char **v)
options = options_new(); options = options_new();
tor_threads_init(); tor_threads_init();
network_init();
struct tor_libevent_cfg cfg; struct tor_libevent_cfg cfg;
memset(&cfg, 0, sizeof(cfg)); memset(&cfg, 0, sizeof(cfg));
tor_libevent_initialize(&cfg); tor_libevent_initialize(&cfg);
@ -284,7 +286,6 @@ main(int c, const char **v)
return 1; return 1;
} }
rep_hist_init(); rep_hist_init();
network_init();
setup_directory(); setup_directory();
options_init(options); options_init(options);
options->DataDirectory = tor_strdup(temp_dir); options->DataDirectory = tor_strdup(temp_dir);