Browse Source

Initialize networking _before_ initializing libevent in the tests

This prevents WSANOTINITIALISED errors and fixes bug 18668. Bugfix
on 0.2.8.1-alpha -- 1bac468882fd732460d8a25735131 specifically.
Nick Mathewson 8 years ago
parent
commit
0f9b0b8bfe
2 changed files with 5 additions and 1 deletions
  1. 3 0
      changes/bug18668
  2. 2 1
      src/test/testing_common.c

+ 3 - 0
changes/bug18668

@@ -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.

+ 2 - 1
src/test/testing_common.c

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