diff options
author | 2018-12-17 11:54:03 -0800 | |
---|---|---|
committer | 2018-12-17 11:54:10 -0800 | |
commit | a303a28895c28a485665fbd617af0025eac7f452 (patch) | |
tree | fd77c6095f6fcf22856a857cf729b04cbd372e1e /test/core/end2end/gen_build_yaml.py | |
parent | aa2e731508de93c2756aac782f166598569ddc44 (diff) | |
parent | 3f7e26e08588bcaceab674f1376d39d66cbaf71f (diff) |
Merge with head and resolve conflict.
Diffstat (limited to 'test/core/end2end/gen_build_yaml.py')
-rwxr-xr-x | test/core/end2end/gen_build_yaml.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/core/end2end/gen_build_yaml.py b/test/core/end2end/gen_build_yaml.py index 99063e13e6..28a7a4e25d 100755 --- a/test/core/end2end/gen_build_yaml.py +++ b/test/core/end2end/gen_build_yaml.py @@ -74,7 +74,9 @@ END2END_FIXTURES = { 'h2_sockpair+trace': socketpair_unsecure_fixture_options._replace( ci_mac=False, tracing=True, large_writes=False, exclude_iomgrs=['uv']), 'h2_ssl': default_secure_fixture_options, - 'h2_local': local_fixture_options, + 'h2_local_uds': local_fixture_options, + 'h2_local_ipv4': local_fixture_options, + 'h2_local_ipv6': local_fixture_options, 'h2_ssl_proxy': default_secure_fixture_options._replace( includes_proxy=True, ci_mac=False, exclude_iomgrs=['uv']), 'h2_uds': uds_fixture_options, |