GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'test/fixes' -- more small fixes

Browse Source 
* test/fixes:
  test: mark http/timeout_read_server as retriable
  test: reset some static vars to avoid affecting other tests
  test: fix printing number of retries for FAILED message
  test: add debugging for bufferevent/bufferevent_connect_fail_eventcb*
  test: suppress logging for buffer/add_file_leak1
This commit is contained in:
Azat Khuzhin 2024-05-06 09:13:15 +02:00
commit c6a74ee04f
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/regress_buffer.c
View File

@ -2968,7 +2968,7 @@ struct testcase_t evbuffer_testcases[] = {
{ "file_segment_add_cleanup_cb", test_evbuffer_file_segment_add_cleanup_cb, 0, NULL, NULL }, { "file_segment_add_cleanup_cb", test_evbuffer_file_segment_add_cleanup_cb, 0, NULL, NULL },
{ "pullup_with_empty", test_evbuffer_pullup_with_empty, 0, NULL, NULL }, { "pullup_with_empty", test_evbuffer_pullup_with_empty, 0, NULL, NULL },
#ifndef EVENT__DISABLE_MM_REPLACEMENT #ifndef EVENT__DISABLE_MM_REPLACEMENT
{ "add_file_leak1", test_evbuffer_add_file_leak1, 0, NULL, NULL }, { "add_file_leak1", test_evbuffer_add_file_leak1, TT_NO_LOGS, NULL, NULL },
#endif #endif
#define ADDFILE_TEST(name, parameters) \ #define ADDFILE_TEST(name, parameters) \

8
test/regress_bufferevent.c
View File

@ -750,8 +750,8 @@ end:
static void static void
reader_eventcb_simple(struct bufferevent *bev, short what, void *ctx) reader_eventcb_simple(struct bufferevent *bev, short what, void *ctx)
{ {
TT_BLATHER(("Read eventcb simple invoked on %d.", TT_BLATHER(("Read eventcb simple invoked on %d (what=%hd).",
(int)bufferevent_getfd(bev))); (int)bufferevent_getfd(bev), what));
n_events_invoked++; n_events_invoked++;
} }
@ -866,6 +866,10 @@ test_bufferevent_connect_fail_eventcb(void *arg)
fake_listener = fake_listener_create(&localhost); fake_listener = fake_listener_create(&localhost);
n_strings_read = 0;
n_reads_invoked = 0;
n_events_invoked = 0;
tt_int_op(n_events_invoked, ==, 0); tt_int_op(n_events_invoked, ==, 0);
bev = bufferevent_socket_new(data->base, -1, flags); bev = bufferevent_socket_new(data->base, -1, flags);

2
test/regress_http.c
View File

@ -6113,7 +6113,7 @@ struct testcase_t http_testcases[] = {
HTTP_OPT(max_connections, SKIP_UNDER_WINDOWS), HTTP_OPT(max_connections, SKIP_UNDER_WINDOWS),
HTTP(timeout_read_client), HTTP(timeout_read_client),
HTTP(timeout_read_server), HTTP_OPT(timeout_read_server, TT_RETRIABLE),
#ifdef EVENT__HAVE_OPENSSL #ifdef EVENT__HAVE_OPENSSL
HTTPS(basic), HTTPS(basic),

6
test/tinytest.c
View File

@ -550,7 +550,8 @@ tinytest_main(int c, const char **v, struct testgroup_t *groups)
struct testgroup_t *group = &groups[i]; struct testgroup_t *group = &groups[i];
for (j = 0; group->cases[j].name; ++j) { for (j = 0; group->cases[j].name; ++j) {
struct testcase_t *testcase = &group->cases[j]; struct testcase_t *testcase = &group->cases[j];
int attempts = (testcase->flags & TT_RETRIABLE) ? opt_retries : 0; int retriable = testcase->flags & TT_RETRIABLE;
int attempts = retriable ? opt_retries : 0;
int test_ret_err; int test_ret_err;
if (!(testcase->flags & TT_ENABLED_)) if (!(testcase->flags & TT_ENABLED_))
@ -575,7 +576,8 @@ tinytest_main(int c, const char **v, struct testgroup_t *groups)
case OK: ++n_ok; break; case OK: ++n_ok; break;
case SKIP: ++n_skipped; break; case SKIP: ++n_skipped; break;
default: default:
printf("\n [FAILED %s%s (%i retries)]\n", group->prefix, testcase->name, opt_retries); printf("\n [FAILED %s%s (%i retries)]\n",
group->prefix, testcase->name, retriable ? opt_retries : 0);
++n_bad; ++n_bad;
break; break;
} }