diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-09-25 11:20:05 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-09-25 11:20:05 -0700 |
| commit | 2d73f05d336236e4a8460e0dbc13b69f6ec67918 (patch) | |
| tree | 5cee526d4343772affc9ba2af5785d3993224fd9 /test/core/end2end | |
| parent | 9be379cc60007b1d8bc4daeb6288c1cf32bbde65 (diff) | |
| parent | 9851e3dbfcee65113005e94e5f4a5a2bbf2052e8 (diff) | |
Merge pull request #3479 from dgquintas/fix_fixtures
Fixed wrong test for FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION
Diffstat (limited to 'test/core/end2end')
| -rw-r--r-- | test/core/end2end/fixtures/h2_oauth2.c | 1 | ||||
| -rw-r--r-- | test/core/end2end/fixtures/h2_ssl+poll.c | 1 | ||||
| -rw-r--r-- | test/core/end2end/fixtures/h2_ssl.c | 1 | ||||
| -rw-r--r-- | test/core/end2end/fixtures/h2_ssl_proxy.c | 1 | ||||
| -rw-r--r-- | test/core/end2end/tests/default_host.c | 2 |
5 files changed, 1 insertions, 5 deletions
diff --git a/test/core/end2end/fixtures/h2_oauth2.c b/test/core/end2end/fixtures/h2_oauth2.c index b4b2e02684..10db6c2c6a 100644 --- a/test/core/end2end/fixtures/h2_oauth2.c +++ b/test/core/end2end/fixtures/h2_oauth2.c @@ -216,7 +216,6 @@ static void chttp2_init_server_simple_ssl_secure_fullstack( static grpc_end2end_test_config configs[] = { {"chttp2/simple_ssl_with_oauth2_fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | - FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, chttp2_create_fixture_secure_fullstack, chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack, diff --git a/test/core/end2end/fixtures/h2_ssl+poll.c b/test/core/end2end/fixtures/h2_ssl+poll.c index 2c605d1471..c2f41f4886 100644 --- a/test/core/end2end/fixtures/h2_ssl+poll.c +++ b/test/core/end2end/fixtures/h2_ssl+poll.c @@ -149,7 +149,6 @@ static void chttp2_init_server_simple_ssl_secure_fullstack( static grpc_end2end_test_config configs[] = { {"chttp2/simple_ssl_fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | - FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, chttp2_create_fixture_secure_fullstack, chttp2_init_client_simple_ssl_secure_fullstack, diff --git a/test/core/end2end/fixtures/h2_ssl.c b/test/core/end2end/fixtures/h2_ssl.c index 9193a09b17..896c60c507 100644 --- a/test/core/end2end/fixtures/h2_ssl.c +++ b/test/core/end2end/fixtures/h2_ssl.c @@ -149,7 +149,6 @@ static void chttp2_init_server_simple_ssl_secure_fullstack( static grpc_end2end_test_config configs[] = { {"chttp2/simple_ssl_fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | - FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, chttp2_create_fixture_secure_fullstack, chttp2_init_client_simple_ssl_secure_fullstack, diff --git a/test/core/end2end/fixtures/h2_ssl_proxy.c b/test/core/end2end/fixtures/h2_ssl_proxy.c index 8133a69a0c..413a8b84cd 100644 --- a/test/core/end2end/fixtures/h2_ssl_proxy.c +++ b/test/core/end2end/fixtures/h2_ssl_proxy.c @@ -178,7 +178,6 @@ static void chttp2_init_server_simple_ssl_secure_fullstack( static grpc_end2end_test_config configs[] = { {"chttp2/simple_ssl_fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | - FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION | FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, chttp2_create_fixture_secure_fullstack, chttp2_init_client_simple_ssl_secure_fullstack, diff --git a/test/core/end2end/tests/default_host.c b/test/core/end2end/tests/default_host.c index 7b62505a9a..294dfba53a 100644 --- a/test/core/end2end/tests/default_host.c +++ b/test/core/end2end/tests/default_host.c @@ -226,7 +226,7 @@ static void test_invoke_simple_request(grpc_end2end_test_config config) { } void grpc_end2end_tests(grpc_end2end_test_config config) { - if ((config.feature_mask & FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION) != 0) + if ((config.feature_mask & FEATURE_MASK_SUPPORTS_HOSTNAME_VERIFICATION) == 0) return; if ((config.feature_mask & FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION) == 0) return; |