3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3807 from sigiesec/fix-test-heartbeats

Browse Source 
Problem: intermittent timeouts on test_heartbeats
This commit is contained in:
Luca Boccassi 2020-02-04 14:42:16 +01:00 committed by GitHub
commit d8851c5ca8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_heartbeats.cpp
View File

@ -50,7 +50,7 @@ SETUP_TEARDOWN_TESTCONTEXT
static int get_monitor_event (void *monitor_)
{
for (int i = 0; i < 2; i++) {
for (int i = 0; i < 10; i++) {
// First frame in message contains event number and value
zmq_msg_t msg;
TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
@ -417,7 +417,9 @@ void test_setsockopt_heartbeat_ttl_near_zero ()
int main (void)
{
setup_test_environment ();
// The test cases are very long-running. The default timeout of 60 seconds
// is not always enough.
setup_test_environment (90);
UNITY_BEGIN ();

8
tests/testutil.cpp
View File

@ -215,7 +215,7 @@ void close_zero_linger (void *socket_)
TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket_));
}
void setup_test_environment ()
void setup_test_environment (int timeout_seconds_)
{
#if defined _WIN32
#if defined _MSC_VER
@ -228,10 +228,8 @@ void setup_test_environment ()
// abort test after 121 seconds
alarm (121);
#else
#if !defined ZMQ_DISABLE_TEST_TIMEOUT
// abort test after 60 seconds
alarm (60);
#endif
// abort test after timeout_seconds_ seconds
alarm (timeout_seconds_);
#endif
#endif
#if defined __MVS__

6
tests/testutil.hpp
View File

@ -144,7 +144,11 @@ void s_recv_seq (void *socket_, ...);
// Sets a zero linger period on a socket and closes it.
void close_zero_linger (void *socket_);
void setup_test_environment (void);
// Setups the test environment. Must be called at the beginning of each test
// executable. On POSIX systems, it sets an alarm to the specified number of
// seconds, after which the test will be killed. Set to 0 to disable this
// timeout.
void setup_test_environment (int timeout_seconds_ = 60);
// Provide portable millisecond sleep
// http://www.cplusplus.com/forum/unices/60161/