cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-08-04 01:36:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

regress_http: make https_basic non time dependent

Browse Source 
Fixes: #454
(cherry picked from commit e29afd4b9428631444b208edfe3a4ba6ce4423af)
This commit is contained in:
Azat Khuzhin 2018-11-02 23:43:57 +03:00 committed by Azat Khuzhin
parent a39898f363
commit 6594bfb41e
No known key found for this signature in database
GPG Key ID: B86086848EF8686D
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
test/regress_http.c
View File

@ -456,16 +456,6 @@ http_chunked_cb(struct evhttp_request *req, void *arg)
event_base_once(arg, -1, EV_TIMEOUT, http_chunked_trickle_cb, state, &when); event_base_once(arg, -1, EV_TIMEOUT, http_chunked_trickle_cb, state, &when);
} }
static void
http_complete_write(evutil_socket_t fd, short what, void *arg)
{
struct bufferevent *bev = arg;
const char *http_request = "host\r\n"
"Connection: close\r\n"
"\r\n";
bufferevent_write(bev, http_request, strlen(http_request));
}
static struct bufferevent * static struct bufferevent *
create_bev(struct event_base *base, int fd, int ssl_mask) create_bev(struct event_base *base, int fd, int ssl_mask)
{ {
@ -493,11 +483,26 @@ create_bev(struct event_base *base, int fd, int ssl_mask)
return bev; return bev;
} }
static void
http_half_writecb(struct bufferevent *bev, void *arg)
{
if (evbuffer_get_length(bufferevent_get_output(bev)) == 0) {
if (!test_ok) {
const char http_request[] = "host\r\n"
"Connection: close\r\n"
"\r\n";
bufferevent_write(bev, http_request, strlen(http_request));
}
/* enable reading of the reply */
bufferevent_enable(bev, EV_READ);
test_ok++;
}
}
static void static void
http_basic_test_impl(void *arg, int ssl, const char *request_line) http_basic_test_impl(void *arg, int ssl, const char *request_line)
{ {
struct basic_test_data *data = arg; struct basic_test_data *data = arg;
struct timeval tv;
struct bufferevent *bev = NULL; struct bufferevent *bev = NULL;
evutil_socket_t fd; evutil_socket_t fd;
const char *http_request; const char *http_request;
@ -507,7 +512,6 @@ http_basic_test_impl(void *arg, int ssl, const char *request_line)
struct evbuffer *out; struct evbuffer *out;
exit_base = data->base; exit_base = data->base;
test_ok = 0;
/* bind to a second socket */ /* bind to a second socket */
if (http_bind(http, &port2, server_flags) == -1) { if (http_bind(http, &port2, server_flags) == -1) {
@ -519,7 +523,7 @@ http_basic_test_impl(void *arg, int ssl, const char *request_line)
/* Stupid thing to send a request */ /* Stupid thing to send a request */
bev = create_bev(data->base, fd, ssl); bev = create_bev(data->base, fd, ssl);
bufferevent_setcb(bev, http_readcb, http_writecb, bufferevent_setcb(bev, http_readcb, http_half_writecb,
http_errorcb, data->base); http_errorcb, data->base);
out = bufferevent_get_output(bev); out = bufferevent_get_output(bev);
@ -528,15 +532,8 @@ http_basic_test_impl(void *arg, int ssl, const char *request_line)
"%s\r\n" "%s\r\n"
"Host: some", request_line); "Host: some", request_line);
evutil_timerclear(&tv); test_ok = 0;
tv.tv_usec = 100000;
if (ssl)
tv.tv_usec *= 10;
event_base_once(data->base,
-1, EV_TIMEOUT, http_complete_write, bev, &tv);
event_base_dispatch(data->base); event_base_dispatch(data->base);
tt_int_op(test_ok, ==, 3); tt_int_op(test_ok, ==, 3);
/* connect to the second port */ /* connect to the second port */
@ -557,9 +554,9 @@ http_basic_test_impl(void *arg, int ssl, const char *request_line)
"Connection: close\r\n" "Connection: close\r\n"
"\r\n", request_line); "\r\n", request_line);
test_ok = 0;
event_base_dispatch(data->base); event_base_dispatch(data->base);
tt_int_op(test_ok, ==, 2);
tt_int_op(test_ok, ==, 5);
/* Connect to the second port again. This time, send an absolute uri. */ /* Connect to the second port again. This time, send an absolute uri. */
bufferevent_free(bev); bufferevent_free(bev);
@ -580,12 +577,12 @@ http_basic_test_impl(void *arg, int ssl, const char *request_line)
bufferevent_write(bev, http_request, strlen(http_request)); bufferevent_write(bev, http_request, strlen(http_request));
test_ok = 0;
event_base_dispatch(data->base); event_base_dispatch(data->base);
tt_int_op(test_ok, ==, 2);
tt_int_op(test_ok, ==, 7);
evhttp_free(http); evhttp_free(http);
end: end:
if (bev) if (bev)
bufferevent_free(bev); bufferevent_free(bev);
} }