diff options
| author | teor <teor@torproject.org> | 2020-04-04 13:23:52 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-04-04 13:23:52 +1000 |
| commit | 2b2e53b7fb5dc68ba4fa5d3b14fc5ca0a78648a2 (patch) | |
| tree | eac0db9419a944a0442f31f4df7879a2678f922d | |
| parent | 628a444242cda3b13b8e0b08a700eee92aeb3a39 (diff) | |
| parent | b1e1c6b505e1cadedf6c05706dfffaaab2b70a25 (diff) | |
| download | tor-2b2e53b7fb5dc68ba4fa5d3b14fc5ca0a78648a2.tar.gz tor-2b2e53b7fb5dc68ba4fa5d3b14fc5ca0a78648a2.zip | |
Merge branch 'maint-0.4.3' into release-0.4.3
| -rw-r--r-- | changes/bug33782 | 7 | ||||
| -rw-r--r-- | src/test/test_connection.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changes/bug33782 b/changes/bug33782 new file mode 100644 index 0000000000..9d4a0e7a79 --- /dev/null +++ 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 index 9cf9efb8a4..bf327c0a3d 100644 --- 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); |