diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-05-08 08:38:53 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-05-08 08:38:53 -0700 |
| commit | cc82be534e88327d9db791d5e7fb8752dd390a3e (patch) | |
| tree | c14543742cfbfe1bca70c0d9f6a2416dcb7d946e /test/core | |
| parent | 12f809fd898d4c8696b7b4d22c3de3e430d2fb2e (diff) | |
| parent | 72a96463f689748c7b63c9f39f92d33e87e87315 (diff) | |
Merge github.com:grpc/grpc into bye-bye-completion-queue-pie
Diffstat (limited to 'test/core')
| -rwxr-xr-x | test/core/end2end/gen_build_json.py | 3 | ||||
| -rw-r--r-- | test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c | 7 | ||||
| -rw-r--r-- | test/core/util/test_config.c | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/test/core/end2end/gen_build_json.py b/test/core/end2end/gen_build_json.py index 1d981cd3ad..dfe9c1d360 100755 --- a/test/core/end2end/gen_build_json.py +++ b/test/core/end2end/gen_build_json.py @@ -65,15 +65,16 @@ END2END_TESTS = { 'max_message_length': True, 'no_op': True, 'ping_pong_streaming': True, + 'registered_call': True, 'request_response_with_binary_metadata_and_payload': True, 'request_response_with_metadata_and_payload': True, 'request_response_with_payload': True, + 'request_response_with_trailing_metadata_and_payload': True, 'request_with_large_metadata': True, 'request_with_payload': True, 'simple_delayed_request': True, 'simple_request': True, 'simple_request_with_high_initial_sequence_number': True, - 'registered_call': True, } diff --git a/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c b/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c index 0c3929f422..060076e2db 100644 --- a/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c +++ b/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c @@ -114,9 +114,9 @@ static void test_request_response_with_metadata_and_payload( grpc_byte_buffer *response_payload = grpc_byte_buffer_create(&response_payload_slice, 1); gpr_timespec deadline = five_seconds_time(); - grpc_metadata meta_c[2] = {{"key1", "val1", 4}, {"key2", "val2", 4}}; - grpc_metadata meta_s[2] = {{"key3", "val3", 4}, {"key4", "val4", 4}}; - grpc_metadata meta_t[2] = {{"key5", "val5", 4}, {"key6", "val6", 4}}; + grpc_metadata meta_c[2] = {{"key1", "val1", 4, {{NULL, NULL, NULL}}}, {"key2", "val2", 4, {{NULL, NULL, NULL}}}}; + grpc_metadata meta_s[2] = {{"key3", "val3", 4, {{NULL, NULL, NULL}}}, {"key4", "val4", 4, {{NULL, NULL, NULL}}}}; + grpc_metadata meta_t[2] = {{"key5", "val5", 4, {{NULL, NULL, NULL}}}, {"key6", "val6", 4, {{NULL, NULL, NULL}}}}; grpc_end2end_test_fixture f = begin_test(config, __FUNCTION__, NULL, NULL); cq_verifier *v_client = cq_verifier_create(f.client_cq); cq_verifier *v_server = cq_verifier_create(f.server_cq); @@ -205,7 +205,6 @@ static void test_request_response_with_metadata_and_payload( GPR_ASSERT(0 == strcmp(details, "xyz")); GPR_ASSERT(0 == strcmp(call_details.method, "/foo")); GPR_ASSERT(0 == strcmp(call_details.host, "foo.test.google.fr")); - GPR_ASSERT(was_cancelled == 1); GPR_ASSERT(byte_buffer_eq_string(request_payload_recv, "hello world")); GPR_ASSERT(byte_buffer_eq_string(response_payload_recv, "hello you")); GPR_ASSERT(contains_metadata(&request_metadata_recv, "key1", "val1")); diff --git a/test/core/util/test_config.c b/test/core/util/test_config.c index 1f0f0175b1..be69fcf675 100644 --- a/test/core/util/test_config.c +++ b/test/core/util/test_config.c @@ -49,10 +49,6 @@ static int seed(void) { return _getpid(); } #endif void grpc_test_init(int argc, char **argv) { -#ifndef GPR_WIN32 - /* disable SIGPIPE */ - signal(SIGPIPE, SIG_IGN); -#endif gpr_log(GPR_DEBUG, "test slowdown: machine=%f build=%f total=%f", GRPC_TEST_SLOWDOWN_MACHINE_FACTOR, GRPC_TEST_SLOWDOWN_BUILD_FACTOR, GRPC_TEST_SLOWDOWN_FACTOR); |