From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 May 2016 18:30:04 +0000 (-0400)
Subject: Initialize networking _before_ initializing libevent in the tests
X-Git-Tag: tor-0.2.8.3-alpha~4^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f9b0b8bfeb861d95c3872525c4a03e77675ccbd;p=thirdparty%2Ftor.git

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

diff --git a/changes/bug18668 b/changes/bug18668
new file mode 100644
index 0000000000..4b186b5c05
--- /dev/null
+++ b/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.
diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index aeb1fa794d..39c3d02ab1 100644
--- a/src/test/testing_common.c
+++ b/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);