Exclude uds from default hostname tests

test/core/end2end/gen_build_json.py

@@ -36,30 +36,30 @@ import simplejson
 import collections
 
 
-FixtureOptions = collections.namedtuple('FixtureOptions', 'fullstack secure platforms')
-default_unsecure_fixture_options = FixtureOptions(True, False, ['windows', 'posix'])
-socketpair_unsecure_fixture_options = FixtureOptions(False, False, ['windows', 'posix'])
-default_secure_fixture_options = FixtureOptions(True, True, ['windows', 'posix'])
+FixtureOptions = collections.namedtuple('FixtureOptions', 'fullstack dns_resolver secure platforms')
+default_unsecure_fixture_options = FixtureOptions(True, True, False, ['windows', 'posix'])
+socketpair_unsecure_fixture_options = FixtureOptions(False, False, False, ['windows', 'posix'])
+default_secure_fixture_options = FixtureOptions(True, True, True, ['windows', 'posix'])
 
 # maps fixture name to whether it requires the security library
 END2END_FIXTURES = {
     'chttp2_fake_security': default_secure_fixture_options,
     'chttp2_fullstack_compression': default_unsecure_fixture_options,
     'chttp2_fullstack': default_unsecure_fixture_options,
-    'chttp2_fullstack_uds_posix': FixtureOptions(True, False, ['posix']),
-    'chttp2_fullstack_uds_posix_with_poll': FixtureOptions(True, False, ['posix']),
-    'chttp2_fullstack_with_poll': FixtureOptions(True, False, ['posix']),
+    'chttp2_fullstack_uds_posix': FixtureOptions(True, False, False, ['posix']),
+    'chttp2_fullstack_uds_posix_with_poll': FixtureOptions(True, False, False, ['posix']),
+    'chttp2_fullstack_with_poll': FixtureOptions(True, True, False, ['posix']),
     'chttp2_simple_ssl_fullstack': default_secure_fixture_options,
-    'chttp2_simple_ssl_fullstack_with_poll': FixtureOptions(True, True, ['posix']),
+    'chttp2_simple_ssl_fullstack_with_poll': FixtureOptions(True, True, True, ['posix']),
     'chttp2_simple_ssl_with_oauth2_fullstack': default_secure_fixture_options,
     'chttp2_socket_pair_one_byte_at_a_time': socketpair_unsecure_fixture_options,
     'chttp2_socket_pair': socketpair_unsecure_fixture_options,
     'chttp2_socket_pair_with_grpc_trace': socketpair_unsecure_fixture_options,
 }
 
-TestOptions = collections.namedtuple('TestOptions', 'needs_fullstack flaky secure')
-default_test_options = TestOptions(False, False, False)
-connectivity_test_options = TestOptions(True, False, False)
+TestOptions = collections.namedtuple('TestOptions', 'needs_fullstack needs_dns flaky secure')
+default_test_options = TestOptions(False, False, False, False)
+connectivity_test_options = TestOptions(True, False, False, False)
 
 # maps test names to options
 END2END_TESTS = {
@@ -71,7 +71,7 @@ END2END_TESTS = {
     'cancel_in_a_vacuum': default_test_options,
     'census_simple_request': default_test_options,
     'channel_connectivity': connectivity_test_options,
-    'default_host': connectivity_test_options,
+    'default_host': TestOptions(True, True, False, False),
     'disappearing_server': connectivity_test_options,
     'early_server_shutdown_finishes_inflight_calls': default_test_options,
     'early_server_shutdown_finishes_tags': default_test_options,
@@ -85,7 +85,7 @@ END2END_TESTS = {
     'registered_call': default_test_options,
     'request_response_with_binary_metadata_and_payload': default_test_options,
     'request_response_with_metadata_and_payload': default_test_options,
-    'request_response_with_payload_and_call_creds': TestOptions(needs_fullstack=False, flaky=False, secure=True),
+    'request_response_with_payload_and_call_creds': TestOptions(needs_fullstack=False, needs_dns=False, flaky=False, secure=True),
     'request_response_with_payload': default_test_options,
     'request_response_with_trailing_metadata_and_payload': default_test_options,
     'request_with_compressed_payload': default_test_options,
@@ -103,6 +103,9 @@ def compatible(f, t):
   if END2END_TESTS[t].needs_fullstack:
     if not END2END_FIXTURES[f].fullstack:
       return False
+  if END2END_TESTS[t].needs_dns:
+    if not END2END_FIXTURES[f].dns_resolver:
+      return False
   return True
 
 
@@ -177,7 +180,7 @@ def main():
               'language': 'c',
               'secure': 'no',
               'src': [],
-              'flaky': 'invoke_large_request' in t,
+              'flaky': END2END_TESTS[t].flaky,
               'platforms': END2END_FIXTURES[f].platforms,
               'deps': [
                   'end2end_fixture_%s' % f,

tools/run_tests/sources_and_headers.json

@@ -3239,21 +3239,6 @@
     "name": "chttp2_fullstack_uds_posix_channel_connectivity_test", 
     "src": []
   }, 
-  {
-    "deps": [
-      "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_default_host", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_default_host_test", 
-    "src": []
-  }, 
   {
     "deps": [
       "end2end_certs", 
@@ -3734,21 +3719,6 @@
     "name": "chttp2_fullstack_uds_posix_with_poll_channel_connectivity_test", 
     "src": []
   }, 
-  {
-    "deps": [
-      "end2end_certs", 
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_default_host", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc", 
-      "grpc_test_util"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_default_host_test", 
-    "src": []
-  }, 
   {
     "deps": [
       "end2end_certs", 
@@ -8402,20 +8372,6 @@
     "name": "chttp2_fullstack_uds_posix_channel_connectivity_unsecure_test", 
     "src": []
   }, 
-  {
-    "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix", 
-      "end2end_test_default_host", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_default_host_unsecure_test", 
-    "src": []
-  }, 
   {
     "deps": [
       "end2end_fixture_chttp2_fullstack_uds_posix", 
@@ -8850,20 +8806,6 @@
     "name": "chttp2_fullstack_uds_posix_with_poll_channel_connectivity_unsecure_test", 
     "src": []
   }, 
-  {
-    "deps": [
-      "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 
-      "end2end_test_default_host", 
-      "gpr", 
-      "gpr_test_util", 
-      "grpc_test_util_unsecure", 
-      "grpc_unsecure"
-    ], 
-    "headers": [], 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_default_host_unsecure_test", 
-    "src": []
-  }, 
   {
     "deps": [
       "end2end_fixture_chttp2_fullstack_uds_posix_with_poll", 

tools/run_tests/tests.json

@@ -1747,14 +1747,6 @@
       "posix"
     ]
   }, 
-  {
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_default_host_test", 
-    "platforms": [
-      "posix"
-    ]
-  }, 
   {
     "flaky": false, 
     "language": "c", 
@@ -2011,14 +2003,6 @@
       "posix"
     ]
   }, 
-  {
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_default_host_test", 
-    "platforms": [
-      "posix"
-    ]
-  }, 
   {
     "flaky": false, 
     "language": "c", 
@@ -4243,7 +4227,7 @@
     ]
   }, 
   {
-    "flaky": true, 
+    "flaky": false, 
     "language": "c", 
     "name": "chttp2_fullstack_invoke_large_request_unsecure_test", 
     "platforms": [
@@ -4531,7 +4515,7 @@
     ]
   }, 
   {
-    "flaky": true, 
+    "flaky": false, 
     "language": "c", 
     "name": "chttp2_fullstack_compression_invoke_large_request_unsecure_test", 
     "platforms": [
@@ -4756,14 +4740,6 @@
       "posix"
     ]
   }, 
-  {
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_default_host_unsecure_test", 
-    "platforms": [
-      "posix"
-    ]
-  }, 
   {
     "flaky": false, 
     "language": "c", 
@@ -4805,7 +4781,7 @@
     ]
   }, 
   {
-    "flaky": true, 
+    "flaky": false, 
     "language": "c", 
     "name": "chttp2_fullstack_uds_posix_invoke_large_request_unsecure_test", 
     "platforms": [
@@ -5012,14 +4988,6 @@
       "posix"
     ]
   }, 
-  {
-    "flaky": false, 
-    "language": "c", 
-    "name": "chttp2_fullstack_uds_posix_with_poll_default_host_unsecure_test", 
-    "platforms": [
-      "posix"
-    ]
-  }, 
   {
     "flaky": false, 
     "language": "c", 
@@ -5061,7 +5029,7 @@
     ]
   }, 
   {
-    "flaky": true, 
+    "flaky": false, 
     "language": "c", 
     "name": "chttp2_fullstack_uds_posix_with_poll_invoke_large_request_unsecure_test", 
     "platforms": [
@@ -5317,7 +5285,7 @@
     ]
   }, 
   {
-    "flaky": true, 
+    "flaky": false, 
     "language": "c", 
     "name": "chttp2_fullstack_with_poll_invoke_large_request_unsecure_test", 
     "platforms": [
@@ -5560,7 +5528,7 @@
     ]
   }, 
   {
-    "flaky": true, 
+    "flaky": false, 
     "language": "c", 
     "name": "chttp2_socket_pair_invoke_large_request_unsecure_test", 
     "platforms": [
@@ -5812,7 +5780,7 @@
     ]
   }, 
   {
-    "flaky": true, 
+    "flaky": false, 
     "language": "c", 
     "name": "chttp2_socket_pair_one_byte_at_a_time_invoke_large_request_unsecure_test", 
     "platforms": [
@@ -6064,7 +6032,7 @@
     ]
   }, 
   {
-    "flaky": true, 
+    "flaky": false, 
     "language": "c", 
     "name": "chttp2_socket_pair_with_grpc_trace_invoke_large_request_unsecure_test", 
     "platforms": [