tor

commit a84fd949ed2deaf0f526569bc5e4c75270d35e41
parent c0fe88b236048b142c959f3514d9f164f9950b63
Author: teor <teor@torproject.org>
Date:   Sat,  4 Apr 2020 13:23:56 +1000

Merge branch 'maint-0.4.3'

Diffstat:
A
changes/bug33782
 | 
7
+++++++
M
src/test/test_connection.h
 | 
2
+-

2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/changes/bug33782 b/changes/bug33782
@@ -0,0 +1,7 @@
+  o Testing:
+    - Avoid conflicts between the fake sockets in tor's unit tests, and real
+      file descriptors. Resolves issues running unit tests with GitHub Actions,
+      where the process that embeds or launches the tests has already opened a
+      large number of file descriptors.
+      Fixes bug 33782; bugfix on 0.2.8.1-alpha.
+      Found and fixed by Putta Khunchalee.
diff --git a/src/test/test_connection.h b/src/test/test_connection.h
@@ -10,7 +10,7 @@
 #define TEST_CONN_ADDRESS_2     "127.0.0.2"
 #define TEST_CONN_PORT          (12345)
 #define TEST_CONN_ADDRESS_PORT  "127.0.0.1:12345"
-#define TEST_CONN_FD_INIT 50
+#define TEST_CONN_FD_INIT       0x10000
 
 void test_conn_lookup_addr_helper(const char *address,
                                   int family, tor_addr_t *addr);