nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 13:06:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tolerate net-unreachable failures in util/socketpair_ersatz

Browse Source 
This can happen when we have no network stack configured. Fixes bug
30804; bugfix on 0.2.5.1-alpha.
This commit is contained in:
Nick Mathewson 2019-06-07 13:52:03 -04:00
parent ecc5feff38
commit c46e99c43c
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug30804 Normal file
View File

@ -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
src/test/test_util.c
View File

@ -5399,6 +5399,11 @@ test_util_socketpair(void *arg)
tt_skip(); tt_skip();
} }
#endif /* defined(__FreeBSD__) */ #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_int_op(0, OP_EQ, socketpair_result);
tt_assert(SOCKET_OK(fds[0])); tt_assert(SOCKET_OK(fds[0]));