diff options
author | 2015-12-10 14:29:25 -0800 | |
---|---|---|
committer | 2015-12-10 14:29:25 -0800 | |
commit | 4b6974ca8cd8cfc967d25980e9285f97409babb7 (patch) | |
tree | 58065960758fe7c9330441514d2516ef37e9ad25 /tools | |
parent | 07c4b573cff8de30e25e76f96617019d2199961a (diff) | |
parent | 13830d009796f7232ac5826a6307874bc0d64d41 (diff) |
Merge pull request #4232 from ctiller/connected-subchannel
Change subchannel connectivity state transition graph
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/run_tests/jobset.py | 31 | ||||
-rw-r--r-- | tools/run_tests/sources_and_headers.json | 116 | ||||
-rw-r--r-- | tools/run_tests/tests.json | 144 |
3 files changed, 25 insertions, 266 deletions
diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index 01739be27c..fdbddf82ee 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -317,9 +317,13 @@ class Jobset(object): self._hashes = {} self._add_env = add_env self.resultset = {} - + self._remaining = None + + def set_remaining(self, remaining): + self._remaining = remaining + def get_num_failures(self): - return self._failures + return self._failures def start(self, spec): """Start a job. Return True on success, False on failure.""" @@ -372,8 +376,9 @@ class Jobset(object): self._running.remove(job) if dead: return if (not self._travis): - message('WAITING', '%d jobs running, %d complete, %d failed' % ( - len(self._running), self._completed, self._failures)) + rstr = '' if self._remaining is None else '%d queued, ' % self._remaining + message('WAITING', '%s%d jobs running, %d complete, %d failed' % ( + rstr, len(self._running), self._completed, self._failures)) if platform_string() == 'windows': time.sleep(0.1) else: @@ -412,6 +417,17 @@ class NoCache(object): pass +def tag_remaining(xs): + staging = [] + for x in xs: + staging.append(x) + if len(staging) > 1000: + yield (staging.pop(0), None) + n = len(staging) + for i, x in enumerate(staging): + yield (x, n - i - 1) + + def run(cmdlines, check_cancelled=_never_cancelled, maxjobs=None, @@ -425,8 +441,11 @@ def run(cmdlines, maxjobs if maxjobs is not None else _DEFAULT_MAX_JOBS, newline_on_success, travis, stop_on_failure, add_env, cache if cache is not None else NoCache()) - for cmdline in cmdlines: + for cmdline, remaining in tag_remaining(cmdlines): if not js.start(cmdline): break - js.finish() + if remaining is not None: + js.set_remaining(remaining) + js.finish() return js.get_num_failures(), js.resultset + diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 704131d5be..e39f325717 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -8219,21 +8219,6 @@ "deps": [ "end2end_certs", "end2end_fixture_h2_uchannel", - "end2end_test_channel_connectivity", - "gpr", - "gpr_test_util", - "grpc", - "grpc_test_util" - ], - "headers": [], - "language": "c", - "name": "h2_uchannel_channel_connectivity_test", - "src": [] - }, - { - "deps": [ - "end2end_certs", - "end2end_fixture_h2_uchannel", "end2end_test_compressed_payload", "gpr", "gpr_test_util", @@ -8249,36 +8234,6 @@ "deps": [ "end2end_certs", "end2end_fixture_h2_uchannel", - "end2end_test_default_host", - "gpr", - "gpr_test_util", - "grpc", - "grpc_test_util" - ], - "headers": [], - "language": "c", - "name": "h2_uchannel_default_host_test", - "src": [] - }, - { - "deps": [ - "end2end_certs", - "end2end_fixture_h2_uchannel", - "end2end_test_disappearing_server", - "gpr", - "gpr_test_util", - "grpc", - "grpc_test_util" - ], - "headers": [], - "language": "c", - "name": "h2_uchannel_disappearing_server_test", - "src": [] - }, - { - "deps": [ - "end2end_certs", - "end2end_fixture_h2_uchannel", "end2end_test_empty_batch", "gpr", "gpr_test_util", @@ -8564,21 +8519,6 @@ "deps": [ "end2end_certs", "end2end_fixture_h2_uchannel", - "end2end_test_simple_delayed_request", - "gpr", - "gpr_test_util", - "grpc", - "grpc_test_util" - ], - "headers": [], - "language": "c", - "name": "h2_uchannel_simple_delayed_request_test", - "src": [] - }, - { - "deps": [ - "end2end_certs", - "end2end_fixture_h2_uchannel", "end2end_test_simple_request", "gpr", "gpr_test_util", @@ -12962,20 +12902,6 @@ { "deps": [ "end2end_nosec_fixture_h2_uchannel", - "end2end_nosec_test_channel_connectivity", - "gpr", - "gpr_test_util", - "grpc_test_util_unsecure", - "grpc_unsecure" - ], - "headers": [], - "language": "c", - "name": "h2_uchannel_channel_connectivity_nosec_test", - "src": [] - }, - { - "deps": [ - "end2end_nosec_fixture_h2_uchannel", "end2end_nosec_test_compressed_payload", "gpr", "gpr_test_util", @@ -12990,34 +12916,6 @@ { "deps": [ "end2end_nosec_fixture_h2_uchannel", - "end2end_nosec_test_default_host", - "gpr", - "gpr_test_util", - "grpc_test_util_unsecure", - "grpc_unsecure" - ], - "headers": [], - "language": "c", - "name": "h2_uchannel_default_host_nosec_test", - "src": [] - }, - { - "deps": [ - "end2end_nosec_fixture_h2_uchannel", - "end2end_nosec_test_disappearing_server", - "gpr", - "gpr_test_util", - "grpc_test_util_unsecure", - "grpc_unsecure" - ], - "headers": [], - "language": "c", - "name": "h2_uchannel_disappearing_server_nosec_test", - "src": [] - }, - { - "deps": [ - "end2end_nosec_fixture_h2_uchannel", "end2end_nosec_test_empty_batch", "gpr", "gpr_test_util", @@ -13284,20 +13182,6 @@ { "deps": [ "end2end_nosec_fixture_h2_uchannel", - "end2end_nosec_test_simple_delayed_request", - "gpr", - "gpr_test_util", - "grpc_test_util_unsecure", - "grpc_unsecure" - ], - "headers": [], - "language": "c", - "name": "h2_uchannel_simple_delayed_request_nosec_test", - "src": [] - }, - { - "deps": [ - "end2end_nosec_fixture_h2_uchannel", "end2end_nosec_test_simple_request", "gpr", "gpr_test_util", diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 289a13d8c4..0c5f6be090 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -8745,24 +8745,6 @@ "exclude_configs": [], "flaky": false, "language": "c", - "name": "h2_uchannel_channel_connectivity_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "exclude_configs": [], - "flaky": false, - "language": "c", "name": "h2_uchannel_compressed_payload_test", "platforms": [ "linux", @@ -8781,42 +8763,6 @@ "exclude_configs": [], "flaky": false, "language": "c", - "name": "h2_uchannel_default_host_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "exclude_configs": [], - "flaky": false, - "language": "c", - "name": "h2_uchannel_disappearing_server_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "exclude_configs": [], - "flaky": false, - "language": "c", "name": "h2_uchannel_empty_batch_test", "platforms": [ "linux", @@ -9159,24 +9105,6 @@ "exclude_configs": [], "flaky": false, "language": "c", - "name": "h2_uchannel_simple_delayed_request_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "exclude_configs": [], - "flaky": false, - "language": "c", "name": "h2_uchannel_simple_request_test", "platforms": [ "linux", @@ -14139,24 +14067,6 @@ "exclude_configs": [], "flaky": false, "language": "c", - "name": "h2_uchannel_channel_connectivity_nosec_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "exclude_configs": [], - "flaky": false, - "language": "c", "name": "h2_uchannel_compressed_payload_nosec_test", "platforms": [ "linux", @@ -14175,42 +14085,6 @@ "exclude_configs": [], "flaky": false, "language": "c", - "name": "h2_uchannel_default_host_nosec_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "exclude_configs": [], - "flaky": false, - "language": "c", - "name": "h2_uchannel_disappearing_server_nosec_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "exclude_configs": [], - "flaky": false, - "language": "c", "name": "h2_uchannel_empty_batch_nosec_test", "platforms": [ "linux", @@ -14553,24 +14427,6 @@ "exclude_configs": [], "flaky": false, "language": "c", - "name": "h2_uchannel_simple_delayed_request_nosec_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "exclude_configs": [], - "flaky": false, - "language": "c", "name": "h2_uchannel_simple_request_nosec_test", "platforms": [ "linux", |