diff options
Diffstat (limited to 'tools/run_tests')
| -rwxr-xr-x | tools/run_tests/dockerjob.py | 3 | ||||
| -rwxr-xr-x | tools/run_tests/run_interop_tests.py | 1 | ||||
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 26 |
3 files changed, 28 insertions, 2 deletions
diff --git a/tools/run_tests/dockerjob.py b/tools/run_tests/dockerjob.py index 7d64222ba0..326c4faed9 100755 --- a/tools/run_tests/dockerjob.py +++ b/tools/run_tests/dockerjob.py @@ -47,6 +47,7 @@ def random_name(base_name): def docker_kill(cid): """Kills a docker container. Returns True if successful.""" return subprocess.call(['docker','kill', str(cid)], + stdin=subprocess.PIPE, stdout=_DEVNULL, stderr=subprocess.STDOUT) == 0 @@ -78,6 +79,7 @@ def finish_jobs(jobs): def image_exists(image): """Returns True if given docker image exists.""" return subprocess.call(['docker','inspect', image], + stdin=subprocess.PIPE, stdout=_DEVNULL, stderr=subprocess.STDOUT) == 0 @@ -88,6 +90,7 @@ def remove_image(image, skip_nonexistent=False, max_retries=10): return True for attempt in range(0, max_retries): if subprocess.call(['docker','rmi', '-f', image], + stdin=subprocess.PIPE, stdout=_DEVNULL, stderr=subprocess.STDOUT) == 0: return True diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 747ba4bd59..5435a1d02f 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -37,7 +37,6 @@ import jobset import multiprocessing import os import report_utils -import subprocess import sys import tempfile import time diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index c2074938d8..577cf4a19f 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -1401,6 +1401,25 @@ { "deps": [ "gpr", + "grpc", + "grpc++", + "grpc++_test_config" + ], + "headers": [ + "test/cpp/util/metrics_server.h", + "test/proto/metrics.grpc.pb.h", + "test/proto/metrics.pb.h" + ], + "language": "c++", + "name": "metrics_client", + "src": [ + "test/cpp/interop/metrics_client.cc", + "test/cpp/util/metrics_server.h" + ] + }, + { + "deps": [ + "gpr", "gpr_test_util", "grpc", "grpc++", @@ -1683,10 +1702,13 @@ "test/cpp/interop/client_helper.h", "test/cpp/interop/interop_client.h", "test/cpp/interop/stress_interop_client.h", + "test/cpp/util/metrics_server.h", "test/proto/empty.grpc.pb.h", "test/proto/empty.pb.h", "test/proto/messages.grpc.pb.h", "test/proto/messages.pb.h", + "test/proto/metrics.grpc.pb.h", + "test/proto/metrics.pb.h", "test/proto/test.grpc.pb.h", "test/proto/test.pb.h" ], @@ -1698,7 +1720,9 @@ "test/cpp/interop/interop_client.h", "test/cpp/interop/stress_interop_client.cc", "test/cpp/interop/stress_interop_client.h", - "test/cpp/interop/stress_test.cc" + "test/cpp/interop/stress_test.cc", + "test/cpp/util/metrics_server.cc", + "test/cpp/util/metrics_server.h" ] }, { |