Skip to content
Snippets Groups Projects
Commit 143cfa77 authored by Craig Tiller's avatar Craig Tiller
Browse files

Disable compression+resource_quota_server tests

parent 2f269ec7
No related branches found
No related tags found
No related merge requests found
...@@ -39,9 +39,9 @@ import hashlib ...@@ -39,9 +39,9 @@ import hashlib
FixtureOptions = collections.namedtuple( FixtureOptions = collections.namedtuple(
'FixtureOptions', 'FixtureOptions',
'fullstack includes_proxy dns_resolver secure platforms ci_mac tracing exclude_configs exclude_iomgrs large_writes') 'fullstack includes_proxy dns_resolver secure platforms ci_mac tracing exclude_configs exclude_iomgrs large_writes enables_compression')
default_unsecure_fixture_options = FixtureOptions( default_unsecure_fixture_options = FixtureOptions(
True, False, True, False, ['windows', 'linux', 'mac', 'posix'], True, False, [], [], True) True, False, True, False, ['windows', 'linux', 'mac', 'posix'], True, False, [], [], True, False)
socketpair_unsecure_fixture_options = default_unsecure_fixture_options._replace(fullstack=False, dns_resolver=False) socketpair_unsecure_fixture_options = default_unsecure_fixture_options._replace(fullstack=False, dns_resolver=False)
default_secure_fixture_options = default_unsecure_fixture_options._replace(secure=True) default_secure_fixture_options = default_unsecure_fixture_options._replace(secure=True)
uds_fixture_options = default_unsecure_fixture_options._replace(dns_resolver=False, platforms=['linux', 'mac', 'posix'], exclude_iomgrs=['uv']) uds_fixture_options = default_unsecure_fixture_options._replace(dns_resolver=False, platforms=['linux', 'mac', 'posix'], exclude_iomgrs=['uv'])
...@@ -51,8 +51,7 @@ fd_unsecure_fixture_options = default_unsecure_fixture_options._replace( ...@@ -51,8 +51,7 @@ fd_unsecure_fixture_options = default_unsecure_fixture_options._replace(
# maps fixture name to whether it requires the security library # maps fixture name to whether it requires the security library
END2END_FIXTURES = { END2END_FIXTURES = {
'h2_compress': default_unsecure_fixture_options, 'h2_compress': default_unsecure_fixture_options._replace(enables_compression=True),
'h2_census': default_unsecure_fixture_options, 'h2_census': default_unsecure_fixture_options,
'h2_load_reporting': default_unsecure_fixture_options, 'h2_load_reporting': default_unsecure_fixture_options,
'h2_fakesec': default_secure_fixture_options._replace(ci_mac=False), 'h2_fakesec': default_secure_fixture_options._replace(ci_mac=False),
...@@ -83,8 +82,8 @@ END2END_FIXTURES = { ...@@ -83,8 +82,8 @@ END2END_FIXTURES = {
TestOptions = collections.namedtuple( TestOptions = collections.namedtuple(
'TestOptions', 'TestOptions',
'needs_fullstack needs_dns proxyable secure traceable cpu_cost exclude_iomgrs large_writes flaky') 'needs_fullstack needs_dns proxyable secure traceable cpu_cost exclude_iomgrs large_writes flaky allow_compression')
default_test_options = TestOptions(False, False, True, False, True, 1.0, [], False, False) default_test_options = TestOptions(False, False, True, False, True, 1.0, [], False, False, True)
connectivity_test_options = default_test_options._replace(needs_fullstack=True) connectivity_test_options = default_test_options._replace(needs_fullstack=True)
LOWCPU = 0.1 LOWCPU = 0.1
...@@ -96,7 +95,8 @@ END2END_TESTS = { ...@@ -96,7 +95,8 @@ END2END_TESTS = {
'bad_ping': connectivity_test_options._replace(proxyable=False), 'bad_ping': connectivity_test_options._replace(proxyable=False),
'binary_metadata': default_test_options._replace(cpu_cost=LOWCPU), 'binary_metadata': default_test_options._replace(cpu_cost=LOWCPU),
'resource_quota_server': default_test_options._replace(large_writes=True, 'resource_quota_server': default_test_options._replace(large_writes=True,
proxyable=False), proxyable=False,
allow_compression=False),
'call_creds': default_test_options._replace(secure=True), 'call_creds': default_test_options._replace(secure=True),
'cancel_after_accept': default_test_options._replace(cpu_cost=LOWCPU), 'cancel_after_accept': default_test_options._replace(cpu_cost=LOWCPU),
'cancel_after_client_done': default_test_options._replace(cpu_cost=LOWCPU), 'cancel_after_client_done': default_test_options._replace(cpu_cost=LOWCPU),
...@@ -172,6 +172,9 @@ def compatible(f, t): ...@@ -172,6 +172,9 @@ def compatible(f, t):
if END2END_TESTS[t].large_writes: if END2END_TESTS[t].large_writes:
if not END2END_FIXTURES[f].large_writes: if not END2END_FIXTURES[f].large_writes:
return False return False
if not END2END_TESTS[t].allow_compression:
if END2END_FIXTURES[f].enables_compression:
return False
return True return True
......
...@@ -7937,29 +7937,6 @@ ...@@ -7937,29 +7937,6 @@
"posix" "posix"
] ]
}, },
{
"args": [
"resource_quota_server"
],
"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": [ "args": [
"server_finishes_request" "server_finishes_request"
...@@ -28751,29 +28728,6 @@ ...@@ -28751,29 +28728,6 @@
"posix" "posix"
] ]
}, },
{
"args": [
"resource_quota_server"
],
"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": [ "args": [
"server_finishes_request" "server_finishes_request"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment