From 474a07564cdf8b5639d24065d694abca2384740d Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Wed, 30 Nov 2022 17:37:32 -0300 Subject: [PATCH] Make test NOT fail --- mip/mip.c | 4 ++++ mongoose.c | 4 ++++ test/driver_mock.c | 2 +- test/mip_test.c | 9 +++++++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/mip/mip.c b/mip/mip.c index 0954249a..1b0374e7 100644 --- a/mip/mip.c +++ b/mip/mip.c @@ -925,6 +925,10 @@ void mg_mgr_poll(struct mg_mgr *mgr, int ms) { mg_timer_poll(&mgr->timers, now); for (c = mgr->conns; c != NULL; c = tmp) { tmp = c->next; + mg_call(c, MG_EV_POLL, &now); + MG_VERBOSE(("%lu .. %c%c%c%c%c", c->id, c->is_tls ? 'T' : 't', + c->is_connecting ? 'C' : 'c', c->is_tls_hs ? 'H' : 'h', + c->is_resolving ? 'R' : 'r', c->is_closing ? 'C' : 'c')); if (c->is_tls_hs) mg_tls_handshake(c); if (can_write(c)) write_conn(c); if (c->is_draining && c->send.len == 0) c->is_closing = 1; diff --git a/mongoose.c b/mongoose.c index 290174af..e0223e2e 100644 --- a/mongoose.c +++ b/mongoose.c @@ -7451,6 +7451,10 @@ void mg_mgr_poll(struct mg_mgr *mgr, int ms) { mg_timer_poll(&mgr->timers, now); for (c = mgr->conns; c != NULL; c = tmp) { tmp = c->next; + mg_call(c, MG_EV_POLL, &now); + MG_VERBOSE(("%lu .. %c%c%c%c%c", c->id, c->is_tls ? 'T' : 't', + c->is_connecting ? 'C' : 'c', c->is_tls_hs ? 'H' : 'h', + c->is_resolving ? 'R' : 'r', c->is_closing ? 'C' : 'c')); if (c->is_tls_hs) mg_tls_handshake(c); if (can_write(c)) write_conn(c); if (c->is_draining && c->send.len == 0) c->is_closing = 1; diff --git a/test/driver_mock.c b/test/driver_mock.c index eb3bcdf9..88a54d7a 100644 --- a/test/driver_mock.c +++ b/test/driver_mock.c @@ -10,7 +10,7 @@ static size_t mock_tx(const void *buf, size_t len, void *data) { static size_t mock_rx(void *buf, size_t len, void *data) { (void) buf, (void) len, (void) data; - return len; + return 0; } static bool mock_up(void *data) { diff --git a/test/mip_test.c b/test/mip_test.c index 7bd86308..9be1581c 100644 --- a/test/mip_test.c +++ b/test/mip_test.c @@ -266,12 +266,17 @@ static void ph(struct mg_connection *c, int ev, void *ev_data, void *fn_data) { } static void test_poll(void) { - int count = 0; + int count = 0, i; struct mg_mgr mgr; mg_mgr_init(&mgr); + struct mip_if mif; + memset(&mif, 0, sizeof(mif)); + mif.driver = &mip_driver_mock; + mip_init(&mgr, &mif); mg_http_listen(&mgr, "http://127.0.0.1:12346", ph, &count); - for (int i = 0; i < 10; i++) mg_mgr_poll(&mgr, 0); + for (i = 0; i < 10; i++) mg_mgr_poll(&mgr, 0); ASSERT(count == 10); + mip_free(&mif); mg_mgr_free(&mgr); }