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

Convert RPC suite. There are still some places it can exit(1), but those always run forked, so no big deal.

Browse Source 
svn:r1083
This commit is contained in:
Nick Mathewson 2009-01-31 18:36:24 +00:00
parent d9628ef4ff
commit fa6ae16992
4 changed files with 81 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/regress.c
View File

@ -2389,10 +2389,6 @@ legacy_main(void)
regress_zlib(); regress_zlib();
#endif #endif
#ifndef WIN32
rpc_suite();
#endif
evtag_test(); evtag_test();
rpc_test(); rpc_test();

1
test/regress.h
View File

@ -39,6 +39,7 @@ extern struct testcase_t util_testcases[];
extern struct testcase_t signal_testcases[]; extern struct testcase_t signal_testcases[];
extern struct testcase_t http_testcases[]; extern struct testcase_t http_testcases[];
extern struct testcase_t dns_testcases[]; extern struct testcase_t dns_testcases[];
extern struct testcase_t rpc_testcases[];
int legacy_main(void); int legacy_main(void);

1
test/regress_main.c
View File

@ -189,6 +189,7 @@ struct testgroup_t testgroups[] = {
{ "util/", util_testcases }, { "util/", util_testcases },
{ "http/", http_testcases }, { "http/", http_testcases },
{ "dns/", dns_testcases }, { "dns/", dns_testcases },
{ "rpc/", rpc_testcases },
END_OF_GROUPS END_OF_GROUPS
}; };

182
test/regress_rpc.c
View File

@ -60,9 +60,7 @@
#include "regress.gen.h" #include "regress.gen.h"
void rpc_suite(void); #include "regress.h"
extern int test_ok;
static struct evhttp * static struct evhttp *
http_setup(short *pport) http_setup(short *pport)
@ -181,15 +179,10 @@ rpc_basic_test(void)
struct evhttp_connection *evcon = NULL; struct evhttp_connection *evcon = NULL;
struct evhttp_request *req = NULL; struct evhttp_request *req = NULL;
fprintf(stdout, "Testing Basic RPC Support: ");
rpc_setup(&http, &port, &base); rpc_setup(&http, &port, &base);
evcon = evhttp_connection_new("127.0.0.1", port); evcon = evhttp_connection_new("127.0.0.1", port);
if (evcon == NULL) { tt_assert(evcon);
fprintf(stdout, "FAILED\n");
exit(1);
}
/* /*
* At this point, we want to schedule an HTTP POST request * At this point, we want to schedule an HTTP POST request
@ -197,10 +190,7 @@ rpc_basic_test(void)
*/ */
req = evhttp_request_new(rpc_postrequest_failure, NULL); req = evhttp_request_new(rpc_postrequest_failure, NULL);
if (req == NULL) { tt_assert(req);
fprintf(stdout, "FAILED\n");
exit(1);
}
/* Add the information that we care about */ /* Add the information that we care about */
evhttp_add_header(req->output_headers, "Host", "somehost"); evhttp_add_header(req->output_headers, "Host", "somehost");
@ -209,8 +199,7 @@ rpc_basic_test(void)
if (evhttp_make_request(evcon, req, if (evhttp_make_request(evcon, req,
EVHTTP_REQ_POST, EVHTTP_REQ_POST,
"/.rpc.Message") == -1) { "/.rpc.Message") == -1) {
fprintf(stdout, "FAILED\n"); tt_abort();
exit(1);
} }
test_ok = 0; test_ok = 0;
@ -221,13 +210,9 @@ rpc_basic_test(void)
rpc_teardown(base); rpc_teardown(base);
if (test_ok != 1) { tt_assert(test_ok == 1);
fprintf(stdout, "FAILED\n");
exit(1);
}
fprintf(stdout, "OK\n");
end:
evhttp_free(http); evhttp_free(http);
} }
@ -237,7 +222,6 @@ rpc_postrequest_done(struct evhttp_request *req, void *arg)
struct kill* kill_reply = NULL; struct kill* kill_reply = NULL;
if (req->response_code != HTTP_OK) { if (req->response_code != HTTP_OK) {
fprintf(stderr, "FAILED (response code)\n"); fprintf(stderr, "FAILED (response code)\n");
exit(1); exit(1);
} }
@ -265,15 +249,10 @@ rpc_basic_message(void)
struct evhttp_request *req = NULL; struct evhttp_request *req = NULL;
struct msg *msg; struct msg *msg;
fprintf(stdout, "Testing Good RPC Post: ");
rpc_setup(&http, &port, &base); rpc_setup(&http, &port, &base);
evcon = evhttp_connection_new("127.0.0.1", port); evcon = evhttp_connection_new("127.0.0.1", port);
if (evcon == NULL) { tt_assert(evcon);
fprintf(stdout, "FAILED\n");
exit(1);
}
/* /*
* At this point, we want to schedule an HTTP POST request * At this point, we want to schedule an HTTP POST request
@ -311,13 +290,7 @@ rpc_basic_message(void)
rpc_teardown(base); rpc_teardown(base);
if (test_ok != 1) { end:
fprintf(stdout, "FAILED\n");
exit(1);
}
fprintf(stdout, "OK\n");
evhttp_free(http); evhttp_free(http);
} }
@ -464,10 +437,8 @@ rpc_basic_client(void)
struct evhttp *http = NULL; struct evhttp *http = NULL;
struct evrpc_base *base = NULL; struct evrpc_base *base = NULL;
struct evrpc_pool *pool = NULL; struct evrpc_pool *pool = NULL;
struct msg *msg; struct msg *msg = NULL;
struct kill *kill; struct kill *kill = NULL;
fprintf(stdout, "Testing RPC Client: ");
rpc_setup(&http, &port, &base); rpc_setup(&http, &port, &base);
@ -497,10 +468,7 @@ rpc_basic_client(void)
event_dispatch(); event_dispatch();
if (test_ok != 1) { tt_assert(test_ok == 1);
fprintf(stdout, "FAILED (1)\n");
exit(1);
}
/* we do it twice to make sure that reuse works correctly */ /* we do it twice to make sure that reuse works correctly */
kill_clear(kill); kill_clear(kill);
@ -509,11 +477,7 @@ rpc_basic_client(void)
event_dispatch(); event_dispatch();
if (test_ok != 2) { tt_assert(test_ok == 2);
fprintf(stdout, "FAILED (2)\n");
exit(1);
}
/* we do it trice to make sure other stuff works, too */ /* we do it trice to make sure other stuff works, too */
kill_clear(kill); kill_clear(kill);
@ -529,18 +493,18 @@ rpc_basic_client(void)
rpc_teardown(base); rpc_teardown(base);
if (test_ok != 3) { tt_assert(test_ok == 3);
fprintf(stdout, "FAILED (3)\n");
exit(1);
}
fprintf(stdout, "OK\n"); end:
if (msg)
msg_free(msg);
if (kill)
kill_free(kill);
msg_free(msg); if (pool)
kill_free(kill); evrpc_pool_free(pool);
if (http)
evrpc_pool_free(pool); evhttp_free(http);
evhttp_free(http);
need_input_hook = 0; need_input_hook = 0;
need_output_hook = 0; need_output_hook = 0;
@ -557,10 +521,8 @@ rpc_basic_queued_client(void)
struct evhttp *http = NULL; struct evhttp *http = NULL;
struct evrpc_base *base = NULL; struct evrpc_base *base = NULL;
struct evrpc_pool *pool = NULL; struct evrpc_pool *pool = NULL;
struct msg *msg; struct msg *msg=NULL;
struct kill *kill_one, *kill_two; struct kill *kill_one=NULL, *kill_two=NULL;
fprintf(stdout, "Testing RPC (Queued) Client: ");
rpc_setup(&http, &port, &base); rpc_setup(&http, &port, &base);
@ -583,19 +545,20 @@ rpc_basic_queued_client(void)
rpc_teardown(base); rpc_teardown(base);
if (test_ok != 2) { tt_assert(test_ok == 2);
fprintf(stdout, "FAILED (1)\n");
exit(1);
}
fprintf(stdout, "OK\n"); end:
if (msg)
msg_free(msg);
if (kill_one)
kill_free(kill_one);
if (kill_two)
kill_free(kill_two);
msg_free(msg); if (pool)
kill_free(kill_one); evrpc_pool_free(pool);
kill_free(kill_two); if (http)
evhttp_free(http);
evrpc_pool_free(pool);
evhttp_free(http);
} }
static void static void
@ -622,7 +585,7 @@ struct _rpc_hook_ctx {
void *ctx; void *ctx;
}; };
static int hook_pause_cb_called; static int hook_pause_cb_called=0;
static void static void
rpc_hook_pause_cb(int fd, short what, void *arg) rpc_hook_pause_cb(int fd, short what, void *arg)
@ -655,10 +618,8 @@ rpc_basic_client_with_pause(void)
struct evhttp *http = NULL; struct evhttp *http = NULL;
struct evrpc_base *base = NULL; struct evrpc_base *base = NULL;
struct evrpc_pool *pool = NULL; struct evrpc_pool *pool = NULL;
struct msg *msg; struct msg *msg = NULL;
struct kill *kill; struct kill *kill= NULL;
fprintf(stdout, "Testing RPC Client with pause hooks: ");
rpc_setup(&http, &port, &base); rpc_setup(&http, &port, &base);
@ -683,20 +644,22 @@ rpc_basic_client_with_pause(void)
event_dispatch(); event_dispatch();
if (test_ok != 1 || hook_pause_cb_called != 4) { tt_int_op(test_ok, ==, 1);
fprintf(stdout, "FAILED\n"); tt_int_op(hook_pause_cb_called, ==, 4);
exit(1);
}
rpc_teardown(base); end:
if (base)
rpc_teardown(base);
fprintf(stdout, "OK\n"); if (msg)
msg_free(msg);
if (kill)
kill_free(kill);
msg_free(msg); if (pool)
kill_free(kill); evrpc_pool_free(pool);
if (http)
evrpc_pool_free(pool); evhttp_free(http);
evhttp_free(http);
} }
static void static void
@ -706,10 +669,8 @@ rpc_client_timeout(void)
struct evhttp *http = NULL; struct evhttp *http = NULL;
struct evrpc_base *base = NULL; struct evrpc_base *base = NULL;
struct evrpc_pool *pool = NULL; struct evrpc_pool *pool = NULL;
struct msg *msg; struct msg *msg = NULL;
struct kill *kill; struct kill *kill = NULL;
fprintf(stdout, "Testing RPC Client Timeout: ");
rpc_setup(&http, &port, &base); rpc_setup(&http, &port, &base);
@ -736,20 +697,35 @@ rpc_client_timeout(void)
rpc_teardown(base); rpc_teardown(base);
if (test_ok != 2) { tt_assert(test_ok == 2);
fprintf(stdout, "FAILED (1)\n");
exit(1);
}
fprintf(stdout, "OK\n"); end:
if (msg)
msg_free(msg);
if (kill)
kill_free(kill);
msg_free(msg); if (pool)
kill_free(kill); evrpc_pool_free(pool);
if (http)
evrpc_pool_free(pool); evhttp_free(http);
evhttp_free(http);
} }
#define RPC_LEGACY(name) \
{ #name, run_legacy_test_fn, TT_FORK|TT_NEED_BASE, &legacy_setup, \
rpc_##name }
struct testcase_t rpc_testcases[] = {
RPC_LEGACY(basic_test),
RPC_LEGACY(basic_message),
RPC_LEGACY(basic_client),
RPC_LEGACY(basic_queued_client),
RPC_LEGACY(basic_client_with_pause),
RPC_LEGACY(client_timeout),
END_OF_TESTCASES,
};
void void
rpc_suite(void) rpc_suite(void)
{ {