diff options
author | Hongyu Chen <hongyu@google.com> | 2015-08-24 10:59:48 -0700 |
---|---|---|
committer | Hongyu Chen <hongyu@google.com> | 2015-08-24 10:59:48 -0700 |
commit | 4473e52311604c27c94994509e4a6322cd0571dc (patch) | |
tree | fac0c7830939cf1aaad95a148f6ea5d1909793fc /tools | |
parent | e09dc78e74f481dd06bf2f9ea643026f5e94bb5b (diff) | |
parent | 04715888e60c6195a2c1d9d6b31f7a82f0d717e2 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/run_tests/run_python.sh | 8 | ||||
-rw-r--r-- | tools/run_tests/tests.json | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tools/run_tests/run_python.sh b/tools/run_tests/run_python.sh index 6f80219b0e..6fdca93fd5 100755 --- a/tools/run_tests/run_python.sh +++ b/tools/run_tests/run_python.sh @@ -39,4 +39,12 @@ export LD_LIBRARY_PATH=$ROOT/libs/$CONFIG export DYLD_LIBRARY_PATH=$ROOT/libs/$CONFIG export PATH=$ROOT/bins/$CONFIG:$ROOT/bins/$CONFIG/protobuf:$PATH source "python"$PYVER"_virtual_environment"/bin/activate + +# TODO(atash): These tests don't currently run under py.test and thus don't +# appear under the coverage report. Find a way to get these tests to work with +# py.test (or find another tool or *something*) that's acceptable to the rest of +# the team... +"python"$PYVER -m grpc_test._core_over_links_base_interface_test +"python"$PYVER -m grpc_test.framework.core._base_interface_test + "python"$PYVER $GRPCIO_TEST/setup.py test -a "-n8 --cov=grpc --junitxml=./report.xml" diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index 6c06d74834..127b1dfc40 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -1538,6 +1538,7 @@ "posix", "windows" ], + "exclude_configs": [], "flaky": false, "language": "c++", "name": "status_test", |