generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-01 11:52:57 +01:00
Code Issues Projects Releases Wiki Activity

Problem: test_timers frequently fails on travis-ci

Browse Source 
Solution: relaxed test assertions, based on the actual time passed,
instead of assuming that this equals to the time slept
This commit is contained in:
sigiesec
2018-02-03 12:31:39 +01:00
committed by Simon Giesecke
parent 3baefc66ea
commit 88d8c768d1
6 changed files with 80 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/test_timers.cpp
View File

@@ -154,13 +154,22 @@ int main (void)
bool timer_invoked = false;
int timer_id = zmq_timers_add (timers, 100, handler, &timer_invoked);
const int full_timeout = 100;
void *const stopwatch = zmq_stopwatch_start ();
int timer_id =
zmq_timers_add (timers, full_timeout, handler, &timer_invoked);
assert (timer_id);
// Timer should be invoked yet
// Timer should not have been invoked yet
int rc = zmq_timers_execute (timers);
assert (rc == 0);
assert (!timer_invoked);
#ifdef ZMQ_BUILD_DRAFT_API
if (zmq_stopwatch_intermediate (stopwatch) < full_timeout) {
assert (!timer_invoked);
}
#endif
// Wait half the time and check again
long timeout = zmq_timers_timeout (timers);
@@ -168,7 +177,11 @@ int main (void)
msleep (timeout / 2);
rc = zmq_timers_execute (timers);
assert (rc == 0);
assert (!timer_invoked);
#ifdef ZMQ_BUILD_DRAFT_API
if (zmq_stopwatch_intermediate (stopwatch) < full_timeout) {
assert (!timer_invoked);
}
#endif
// Wait until the end
rc = sleep_and_execute (timers);
@@ -182,7 +195,11 @@ int main (void)
msleep (timeout / 2);
rc = zmq_timers_execute (timers);
assert (rc == 0);
assert (!timer_invoked);
#ifdef ZMQ_BUILD_DRAFT_API
if (zmq_stopwatch_intermediate (stopwatch) < 2 * full_timeout) {
assert (!timer_invoked);
}
#endif
// Reset timer and wait half of the time left
rc = zmq_timers_reset (timers, timer_id);
@@ -190,7 +207,9 @@ int main (void)
msleep (timeout / 2);
rc = zmq_timers_execute (timers);
assert (rc == 0);
assert (!timer_invoked);
if (zmq_stopwatch_stop (stopwatch) < 2 * full_timeout) {
assert (!timer_invoked);
}
// Wait until the end
rc = sleep_and_execute (timers);