Remove packet coalescing testing on chttp2

pull/9246/head
Muxi Yan 8 years ago
parent 1da51ce3f6
commit dc739bd659
  1. 2
      Makefile
  2. 9
      src/objective-c/tests/CoreCronetEnd2EndTests/CoreCronetEnd2EndTests.m
  3. 8
      test/core/end2end/end2end_nosec_tests.c
  4. 8
      test/core/end2end/end2end_tests.c
  5. 1
      test/core/end2end/gen_build_yaml.py
  6. 4
      test/core/end2end/tests/packet_coalescing.c
  7. 2
      tools/run_tests/generated/sources_and_headers.json
  8. 736
      tools/run_tests/generated/tests.json
  9. 2
      vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj
  10. 3
      vsprojects/vcxproj/test/end2end/tests/end2end_nosec_tests/end2end_nosec_tests.vcxproj.filters
  11. 2
      vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj
  12. 3
      vsprojects/vcxproj/test/end2end/tests/end2end_tests/end2end_tests.vcxproj.filters

@ -7199,7 +7199,6 @@ LIBEND2END_TESTS_SRC = \
test/core/end2end/tests/network_status_change.c \
test/core/end2end/tests/no_logging.c \
test/core/end2end/tests/no_op.c \
test/core/end2end/tests/packet_coalescing.c \
test/core/end2end/tests/payload.c \
test/core/end2end/tests/ping.c \
test/core/end2end/tests/ping_pong_streaming.c \
@ -7286,7 +7285,6 @@ LIBEND2END_NOSEC_TESTS_SRC = \
test/core/end2end/tests/network_status_change.c \
test/core/end2end/tests/no_logging.c \
test/core/end2end/tests/no_op.c \
test/core/end2end/tests/packet_coalescing.c \
test/core/end2end/tests/payload.c \
test/core/end2end/tests/ping.c \
test/core/end2end/tests/ping_pong_streaming.c \

@ -168,6 +168,9 @@ static grpc_end2end_test_config configs[] = {
chttp2_tear_down_secure_fullstack},
};
extern void packet_coalescing(grpc_end2end_test_config config);
extern void packet_coalescing_pre_init(void);
static char *roots_filename;
@interface CoreCronetEnd2EndTests : XCTestCase
@ -347,7 +350,11 @@ static char *roots_filename;
}
- (void)testPacketCoalescing {
[self testIndividualCase:"packet_coalescing"];
// Directly invoke the test function since the test is for Cronet only and thus not included in
// end2end_tests.c
// TODO (mxyan): Do the same to all test cases so that this file will no longer depend on
// end2end_tests.c
packet_coalescing(configs[0]);
}
- (void)testPayload {

@ -103,8 +103,6 @@ extern void no_logging(grpc_end2end_test_config config);
extern void no_logging_pre_init(void);
extern void no_op(grpc_end2end_test_config config);
extern void no_op_pre_init(void);
extern void packet_coalescing(grpc_end2end_test_config config);
extern void packet_coalescing_pre_init(void);
extern void payload(grpc_end2end_test_config config);
extern void payload_pre_init(void);
extern void ping(grpc_end2end_test_config config);
@ -171,7 +169,6 @@ void grpc_end2end_tests_pre_init(void) {
network_status_change_pre_init();
no_logging_pre_init();
no_op_pre_init();
packet_coalescing_pre_init();
payload_pre_init();
ping_pre_init();
ping_pong_streaming_pre_init();
@ -227,7 +224,6 @@ void grpc_end2end_tests(int argc, char **argv,
network_status_change(config);
no_logging(config);
no_op(config);
packet_coalescing(config);
payload(config);
ping(config);
ping_pong_streaming(config);
@ -368,10 +364,6 @@ void grpc_end2end_tests(int argc, char **argv,
no_op(config);
continue;
}
if (0 == strcmp("packet_coalescing", argv[i])) {
packet_coalescing(config);
continue;
}
if (0 == strcmp("payload", argv[i])) {
payload(config);
continue;

@ -105,8 +105,6 @@ extern void no_logging(grpc_end2end_test_config config);
extern void no_logging_pre_init(void);
extern void no_op(grpc_end2end_test_config config);
extern void no_op_pre_init(void);
extern void packet_coalescing(grpc_end2end_test_config config);
extern void packet_coalescing_pre_init(void);
extern void payload(grpc_end2end_test_config config);
extern void payload_pre_init(void);
extern void ping(grpc_end2end_test_config config);
@ -174,7 +172,6 @@ void grpc_end2end_tests_pre_init(void) {
network_status_change_pre_init();
no_logging_pre_init();
no_op_pre_init();
packet_coalescing_pre_init();
payload_pre_init();
ping_pre_init();
ping_pong_streaming_pre_init();
@ -231,7 +228,6 @@ void grpc_end2end_tests(int argc, char **argv,
network_status_change(config);
no_logging(config);
no_op(config);
packet_coalescing(config);
payload(config);
ping(config);
ping_pong_streaming(config);
@ -376,10 +372,6 @@ void grpc_end2end_tests(int argc, char **argv,
no_op(config);
continue;
}
if (0 == strcmp("packet_coalescing", argv[i])) {
packet_coalescing(config);
continue;
}
if (0 == strcmp("payload", argv[i])) {
payload(config);
continue;

@ -126,7 +126,6 @@ END2END_TESTS = {
'network_status_change': default_test_options,
'no_logging': default_test_options._replace(traceable=False),
'no_op': default_test_options,
'packet_coalescing': default_test_options,
'payload': default_test_options,
'load_reporting_hook': default_test_options,
'ping_pong_streaming': default_test_options,

@ -273,10 +273,6 @@ static void test_request_response_with_metadata_and_payload(
}
void packet_coalescing(grpc_end2end_test_config config) {
/* The test case does not support the fixture socketpair_one_byte_at_a_time */
if (0 == strcmp(config.name, "chttp2/socketpair_one_byte_at_a_time")) {
return;
}
gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG);
grpc_tracer_set_enabled("all", 1);
gpr_set_log_function(log_processor);

@ -6347,7 +6347,6 @@
"test/core/end2end/tests/network_status_change.c",
"test/core/end2end/tests/no_logging.c",
"test/core/end2end/tests/no_op.c",
"test/core/end2end/tests/packet_coalescing.c",
"test/core/end2end/tests/payload.c",
"test/core/end2end/tests/ping.c",
"test/core/end2end/tests/ping_pong_streaming.c",
@ -6417,7 +6416,6 @@
"test/core/end2end/tests/network_status_change.c",
"test/core/end2end/tests/no_logging.c",
"test/core/end2end/tests/no_op.c",
"test/core/end2end/tests/packet_coalescing.c",
"test/core/end2end/tests/payload.c",
"test/core/end2end/tests/ping.c",
"test/core/end2end/tests/ping_pong_streaming.c",

@ -5712,29 +5712,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"language": "c",
"name": "h2_census_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -6818,29 +6795,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"language": "c",
"name": "h2_compress_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -7893,28 +7847,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"language": "c",
"name": "h2_fakesec_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -8911,29 +8843,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_fd_test",
"platforms": [
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -9971,29 +9880,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"language": "c",
"name": "h2_full_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -10951,25 +10837,6 @@
"linux"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"linux"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_full+pipe_test",
"platforms": [
"linux"
]
},
{
"args": [
"payload"
@ -11943,29 +11810,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"language": "c",
"name": "h2_full+trace_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -13078,30 +12922,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_http_proxy_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -14201,29 +14021,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"language": "c",
"name": "h2_load_reporting_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -15336,30 +15133,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_oauth2_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -16392,30 +16165,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_proxy_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -17402,7 +17151,7 @@
},
{
"args": [
"packet_coalescing"
"payload"
],
"ci_platforms": [
"windows",
@ -17426,7 +17175,7 @@
},
{
"args": [
"payload"
"ping_pong_streaming"
],
"ci_platforms": [
"windows",
@ -17450,7 +17199,7 @@
},
{
"args": [
"ping_pong_streaming"
"registered_call"
],
"ci_platforms": [
"windows",
@ -17474,14 +17223,14 @@
},
{
"args": [
"registered_call"
"request_with_flags"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"cpu_cost": 0.1,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
@ -17498,14 +17247,14 @@
},
{
"args": [
"request_with_flags"
"request_with_payload"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 0.1,
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
@ -17522,31 +17271,7 @@
},
{
"args": [
"request_with_payload"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_sockpair_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"resource_quota_server"
"resource_quota_server"
],
"ci_platforms": [
"windows",
@ -18384,30 +18109,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_sockpair+trace_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -19448,32 +19149,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [
"msan"
],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -20527,29 +20202,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -21633,29 +21285,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_cert_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -22672,30 +22301,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_ssl_proxy_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -23698,29 +23303,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_uds_test",
"platforms": [
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -24781,29 +24363,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"language": "c",
"name": "h2_census_nosec_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -25864,29 +25423,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"language": "c",
"name": "h2_compress_nosec_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -26876,29 +26412,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_fd_nosec_test",
"platforms": [
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -27913,29 +27426,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"language": "c",
"name": "h2_full_nosec_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -28874,25 +28364,6 @@
"linux"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"linux"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_full+pipe_nosec_test",
"platforms": [
"linux"
]
},
{
"args": [
"payload"
@ -29843,29 +29314,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"language": "c",
"name": "h2_full+trace_nosec_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -30954,30 +30402,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_http_proxy_nosec_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -32054,29 +31478,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [],
"flaky": false,
"language": "c",
"name": "h2_load_reporting_nosec_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -33069,30 +32470,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_proxy_nosec_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -34053,30 +33430,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_sockpair_nosec_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -35013,30 +34366,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_sockpair+trace_nosec_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -36051,32 +35380,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"windows",
"linux",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [
"msan"
],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_nosec_test",
"platforms": [
"windows",
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"
@ -37082,29 +36385,6 @@
"posix"
]
},
{
"args": [
"packet_coalescing"
],
"ci_platforms": [
"linux",
"mac",
"posix"
],
"cpu_cost": 1.0,
"exclude_configs": [],
"exclude_iomgrs": [
"uv"
],
"flaky": false,
"language": "c",
"name": "h2_uds_nosec_test",
"platforms": [
"linux",
"mac",
"posix"
]
},
{
"args": [
"payload"

@ -215,8 +215,6 @@
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\no_op.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\packet_coalescing.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c">

@ -97,9 +97,6 @@
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\no_op.c">
<Filter>test\core\end2end\tests</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\packet_coalescing.c">
<Filter>test\core\end2end\tests</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c">
<Filter>test\core\end2end\tests</Filter>
</ClCompile>

@ -217,8 +217,6 @@
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\no_op.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\packet_coalescing.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c">
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\ping.c">

@ -100,9 +100,6 @@
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\no_op.c">
<Filter>test\core\end2end\tests</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\packet_coalescing.c">
<Filter>test\core\end2end\tests</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)\..\test\core\end2end\tests\payload.c">
<Filter>test\core\end2end\tests</Filter>
</ClCompile>

Loading…
Cancel
Save