Skip to content

Commit 7273016

Browse files
committed
made test more robust by increasing tries for polling and breaking after event occurred
1 parent f2e9762 commit 7273016

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

tests/monitor.cpp

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ TEST_CASE("poll monitor events using active poller", "[monitor]")
175175
[&](zmq::event_flags ef) { process_event(static_cast<short>(ef)); });
176176
}
177177

178-
void on_event_accepted(const zmq_event_t &event_,
179-
const char *addr_) override
178+
void on_event_accepted(const zmq_event_t &event_, const char *addr_) override
180179
{
181180
clientAccepted++;
182181
}
@@ -205,7 +204,8 @@ TEST_CASE("poll monitor events using active poller", "[monitor]")
205204
common_server_client_setup sockets(false);
206205

207206
test_monitor monitor;
208-
monitor.init(sockets.server, monitorAddress);
207+
monitor.init(sockets.server, monitorAddress,
208+
ZMQ_EVENT_ACCEPTED | ZMQ_EVENT_DISCONNECTED);
209209

210210
zmq::active_poller_t poller;
211211
monitor.addToPoller(poller);
@@ -217,16 +217,22 @@ TEST_CASE("poll monitor events using active poller", "[monitor]")
217217
CHECK(monitor.clientDisconnected == 0);
218218

219219
//Act
220-
for (int i = 0; i < 10; i++) {
221-
poller.wait(std::chrono::milliseconds(10));
220+
for (int i = 0; i < 100; i++) {
221+
poller.wait(std::chrono::milliseconds(50));
222+
if (monitor.clientAccepted > 0) {
223+
break;
224+
}
222225
}
223226
CHECK(monitor.clientAccepted == 1);
224227
CHECK(monitor.clientDisconnected == 0);
225228

226229
sockets.client.close();
227230

228-
for (int i = 0; i < 10; i++) {
229-
poller.wait(std::chrono::milliseconds(10));
231+
for (int i = 0; i < 100; i++) {
232+
poller.wait(std::chrono::milliseconds(50));
233+
if (monitor.clientDisconnected > 0) {
234+
break;
235+
}
230236
}
231237
sockets.server.close();
232238

0 commit comments

Comments
 (0)