Browse Source

Tolerate net-unreachable failures in util/socketpair_ersatz

This can happen when we have no network stack configured. Fixes bug
30804; bugfix on 0.2.5.1-alpha.
Nick Mathewson 5 years ago
parent
commit
c46e99c43c
2 changed files with 9 additions and 0 deletions
  1. 4 0
      changes/bug30804
  2. 5 0
      src/test/test_util.c

+ 4 - 0
changes/bug30804

@@ -0,0 +1,4 @@
+  o Minor bugfixes (testing):
+    - Teach the util/socketpair_ersatz test to work correctly when we
+      have no network stack configured. Fixes bug 30804; bugfix on
+      0.2.5.1-alpha.

+ 5 - 0
src/test/test_util.c

@@ -5399,6 +5399,11 @@ test_util_socketpair(void *arg)
     tt_skip();
   }
 #endif /* defined(__FreeBSD__) */
+  if (ersatz && socketpair_result == -ENETUNREACH) {
+    /* We can also fail with -ENETUNREACH if we have no network stack at
+     * all. */
+    tt_skip();
+  }
   tt_int_op(0, OP_EQ, socketpair_result);
 
   tt_assert(SOCKET_OK(fds[0]));