Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up end2end_(nosec_)tests

Browse Source
pull/8343/head
Muxi Yan 9 years ago
parent 22d98e14bd
commit 664b587be8
2 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      test/core/end2end/end2end_nosec_tests.c
  2. 16
      test/core/end2end/end2end_tests.c

16
test/core/end2end/end2end_nosec_tests.c
Unescape View File

@ -43,6 +43,8 @@
static bool g_pre_init_called = false; static bool g_pre_init_called = false;
extern void authority_not_supported(grpc_end2end_test_config config);
extern void authority_not_supported_pre_init(void);
extern void bad_hostname(grpc_end2end_test_config config); extern void bad_hostname(grpc_end2end_test_config config);
extern void bad_hostname_pre_init(void); extern void bad_hostname_pre_init(void);
extern void binary_metadata(grpc_end2end_test_config config); extern void binary_metadata(grpc_end2end_test_config config);
@ -131,12 +133,11 @@ extern void streaming_error_response(grpc_end2end_test_config config);
extern void streaming_error_response_pre_init(void); extern void streaming_error_response_pre_init(void);
extern void trailing_metadata(grpc_end2end_test_config config); extern void trailing_metadata(grpc_end2end_test_config config);
extern void trailing_metadata_pre_init(void); extern void trailing_metadata_pre_init(void);
extern void authority_not_supported(grpc_end2end_test_config config);
extern void authority_not_supported_pre_init(void);
void grpc_end2end_tests_pre_init(void) { void grpc_end2end_tests_pre_init(void) {
GPR_ASSERT(!g_pre_init_called); GPR_ASSERT(!g_pre_init_called);
g_pre_init_called = true; g_pre_init_called = true;
authority_not_supported_pre_init();
bad_hostname_pre_init(); bad_hostname_pre_init();
binary_metadata_pre_init(); binary_metadata_pre_init();
cancel_after_accept_pre_init(); cancel_after_accept_pre_init();
@ -181,7 +182,6 @@ void grpc_end2end_tests_pre_init(void) {
simple_request_pre_init(); simple_request_pre_init();
streaming_error_response_pre_init(); streaming_error_response_pre_init();
trailing_metadata_pre_init(); trailing_metadata_pre_init();
authority_not_supported_pre_init();
} }
void grpc_end2end_tests(int argc, char **argv, void grpc_end2end_tests(int argc, char **argv,
@ -191,6 +191,7 @@ void grpc_end2end_tests(int argc, char **argv,
GPR_ASSERT(g_pre_init_called); GPR_ASSERT(g_pre_init_called);
if (argc <= 1) { if (argc <= 1) {
authority_not_supported(config);
bad_hostname(config); bad_hostname(config);
binary_metadata(config); binary_metadata(config);
cancel_after_accept(config); cancel_after_accept(config);
@ -235,11 +236,14 @@ void grpc_end2end_tests(int argc, char **argv,
simple_request(config); simple_request(config);
streaming_error_response(config); streaming_error_response(config);
trailing_metadata(config); trailing_metadata(config);
authority_not_supported(config);
return; return;
} }
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
if (0 == strcmp("authority_not_supported", argv[i])) {
authority_not_supported(config);
continue;
}
if (0 == strcmp("bad_hostname", argv[i])) { if (0 == strcmp("bad_hostname", argv[i])) {
bad_hostname(config); bad_hostname(config);
continue; continue;
@ -416,10 +420,6 @@ void grpc_end2end_tests(int argc, char **argv,
trailing_metadata(config); trailing_metadata(config);
continue; continue;
} }
if (0 == strcmp("authority_not_supported", argv[i])) {
authority_not_supported(config);
continue;
}
gpr_log(GPR_DEBUG, "not a test: '%s'", argv[i]); gpr_log(GPR_DEBUG, "not a test: '%s'", argv[i]);
abort(); abort();
} }

16
test/core/end2end/end2end_tests.c
Unescape View File

@ -43,6 +43,8 @@
static bool g_pre_init_called = false; static bool g_pre_init_called = false;
extern void authority_not_supported(grpc_end2end_test_config config);
extern void authority_not_supported_pre_init(void);
extern void bad_hostname(grpc_end2end_test_config config); extern void bad_hostname(grpc_end2end_test_config config);
extern void bad_hostname_pre_init(void); extern void bad_hostname_pre_init(void);
extern void binary_metadata(grpc_end2end_test_config config); extern void binary_metadata(grpc_end2end_test_config config);
@ -133,12 +135,11 @@ extern void streaming_error_response(grpc_end2end_test_config config);
extern void streaming_error_response_pre_init(void); extern void streaming_error_response_pre_init(void);
extern void trailing_metadata(grpc_end2end_test_config config); extern void trailing_metadata(grpc_end2end_test_config config);
extern void trailing_metadata_pre_init(void); extern void trailing_metadata_pre_init(void);
extern void authority_not_supported(grpc_end2end_test_config config);
extern void authority_not_supported_pre_init(void);
void grpc_end2end_tests_pre_init(void) { void grpc_end2end_tests_pre_init(void) {
GPR_ASSERT(!g_pre_init_called); GPR_ASSERT(!g_pre_init_called);
g_pre_init_called = true; g_pre_init_called = true;
authority_not_supported_pre_init();
bad_hostname_pre_init(); bad_hostname_pre_init();
binary_metadata_pre_init(); binary_metadata_pre_init();
call_creds_pre_init(); call_creds_pre_init();
@ -184,7 +185,6 @@ void grpc_end2end_tests_pre_init(void) {
simple_request_pre_init(); simple_request_pre_init();
streaming_error_response_pre_init(); streaming_error_response_pre_init();
trailing_metadata_pre_init(); trailing_metadata_pre_init();
authority_not_supported_pre_init();
} }
void grpc_end2end_tests(int argc, char **argv, void grpc_end2end_tests(int argc, char **argv,
@ -194,6 +194,7 @@ void grpc_end2end_tests(int argc, char **argv,
GPR_ASSERT(g_pre_init_called); GPR_ASSERT(g_pre_init_called);
if (argc <= 1) { if (argc <= 1) {
authority_not_supported(config);
bad_hostname(config); bad_hostname(config);
binary_metadata(config); binary_metadata(config);
call_creds(config); call_creds(config);
@ -239,11 +240,14 @@ void grpc_end2end_tests(int argc, char **argv,
simple_request(config); simple_request(config);
streaming_error_response(config); streaming_error_response(config);
trailing_metadata(config); trailing_metadata(config);
authority_not_supported(config);
return; return;
} }
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
if (0 == strcmp("authority_not_supported", argv[i])) {
authority_not_supported(config);
continue;
}
if (0 == strcmp("bad_hostname", argv[i])) { if (0 == strcmp("bad_hostname", argv[i])) {
bad_hostname(config); bad_hostname(config);
continue; continue;
@ -424,10 +428,6 @@ void grpc_end2end_tests(int argc, char **argv,
trailing_metadata(config); trailing_metadata(config);
continue; continue;
} }
if (0 == strcmp("authority_not_supported", argv[i])) {
authority_not_supported(config);
continue;
}
gpr_log(GPR_DEBUG, "not a test: '%s'", argv[i]); gpr_log(GPR_DEBUG, "not a test: '%s'", argv[i]);
abort(); abort();
} }

Write Preview
Loading…
Cancel
Save