walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix broken test_nghttp2_session_pop_next_ob_item

This commit is contained in:
Tatsuhiro Tsujikawa 2016-01-11 00:46:44 +09:00
parent 9cea986819
commit 8f225ae88d
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/nghttp2_session_test.c
View File

@ -5059,14 +5059,13 @@ void test_nghttp2_session_pop_next_ob_item(void) {
nghttp2_session_callbacks callbacks; nghttp2_session_callbacks callbacks;
nghttp2_outbound_item *item; nghttp2_outbound_item *item;
nghttp2_priority_spec pri_spec; nghttp2_priority_spec pri_spec;
nghttp2_stream *stream;
nghttp2_mem *mem; nghttp2_mem *mem;
mem = nghttp2_mem_default(); mem = nghttp2_mem_default();
memset(&callbacks, 0, sizeof(nghttp2_session_callbacks)); memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
callbacks.send_callback = null_send_callback; callbacks.send_callback = null_send_callback;
nghttp2_session_server_new(&session, &callbacks, NULL); nghttp2_session_client_new(&session, &callbacks, NULL);
session->remote_settings.max_concurrent_streams = 1; session->remote_settings.max_concurrent_streams = 1;
CU_ASSERT(NULL == nghttp2_session_pop_next_ob_item(session)); CU_ASSERT(NULL == nghttp2_session_pop_next_ob_item(session));
@ -5091,27 +5090,13 @@ void test_nghttp2_session_pop_next_ob_item(void) {
/* Incoming stream does not affect the number of outgoing max /* Incoming stream does not affect the number of outgoing max
concurrent streams. */ concurrent streams. */
nghttp2_session_open_stream(session, 1, NGHTTP2_STREAM_FLAG_NONE, open_recv_stream(session, 4);
&pri_spec_default, NGHTTP2_STREAM_OPENING, NULL);
/* In-flight outgoing stream */ /* In-flight outgoing stream */
nghttp2_session_open_stream(session, 4, NGHTTP2_STREAM_FLAG_NONE, open_sent_stream(session, 1);
&pri_spec_default, NGHTTP2_STREAM_OPENING, NULL);
nghttp2_priority_spec_init(&pri_spec, 0, NGHTTP2_MAX_WEIGHT, 0); nghttp2_priority_spec_init(&pri_spec, 0, NGHTTP2_MAX_WEIGHT, 0);
nghttp2_submit_request(session, &pri_spec, NULL, 0, NULL, NULL); nghttp2_submit_request(session, &pri_spec, NULL, 0, NULL, NULL);
nghttp2_submit_response(session, 1, NULL, 0, NULL);
item = nghttp2_session_pop_next_ob_item(session);
CU_ASSERT(NGHTTP2_HEADERS == item->frame.hd.type);
CU_ASSERT(1 == item->frame.hd.stream_id);
stream = nghttp2_session_get_stream(session, 1);
nghttp2_stream_detach_item(stream);
nghttp2_outbound_item_free(item, mem);
mem->free(item, NULL);
CU_ASSERT(NULL == nghttp2_session_pop_next_ob_item(session)); CU_ASSERT(NULL == nghttp2_session_pop_next_ob_item(session));
@ -5127,8 +5112,7 @@ void test_nghttp2_session_pop_next_ob_item(void) {
/* Check that push reply HEADERS are queued into ob_ss_pq */ /* Check that push reply HEADERS are queued into ob_ss_pq */
nghttp2_session_server_new(&session, &callbacks, NULL); nghttp2_session_server_new(&session, &callbacks, NULL);
session->remote_settings.max_concurrent_streams = 0; session->remote_settings.max_concurrent_streams = 0;
nghttp2_session_open_stream(session, 2, NGHTTP2_STREAM_FLAG_NONE, open_sent_stream2(session, 2, NGHTTP2_STREAM_RESERVED);
&pri_spec_default, NGHTTP2_STREAM_RESERVED, NULL);
CU_ASSERT(0 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, 2, CU_ASSERT(0 == nghttp2_submit_headers(session, NGHTTP2_FLAG_END_STREAM, 2,
NULL, NULL, 0, NULL)); NULL, NULL, 0, NULL));
CU_ASSERT(NULL == nghttp2_session_pop_next_ob_item(session)); CU_ASSERT(NULL == nghttp2_session_pop_next_ob_item(session));