diff options
| author |  Mehrdad Afshari <mehrdada@users.noreply.github.com> | 2018-04-27 00:12:13 -0700 |
|---|---|---|
| committer | Mehrdad Afshari <mehrdada@users.noreply.github.com> | 2018-04-27 06:59:51 -0700 |
| commit | f4bea02a725bd3743a1a93dcf9adfefc76a9a58b (patch) | |
| tree | 438da5c0cded28aed6746ff70e9164bb8288299e | |
| parent | 97904d46e06085bb1fa3d3318933d570d0b4468b (diff) | |
Fix the Python source distribtest script
| -rwxr-xr-x | test/distrib/python/test_packages.sh | 18 | ||||
| -rw-r--r-- | tools/run_tests/artifacts/distribtest_targets.py | 8 |
2 files changed, 18 insertions, 8 deletions
diff --git a/test/distrib/python/test_packages.sh b/test/distrib/python/test_packages.sh index e16eddd577..6bf49d45b9 100755 --- a/test/distrib/python/test_packages.sh +++ b/test/distrib/python/test_packages.sh @@ -22,12 +22,14 @@ shopt -s nullglob if [[ "$1" == "binary" ]] then echo "Testing Python binary distribution" - ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-*.whl) - TOOLS_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio_tools-*.whl) + ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-[0-9]*.whl) + TOOLS_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio_tools-[0-9]*.whl) else echo "Testing Python source distribution" - ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-*.tar.gz) - TOOLS_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio_tools-*.tar.gz) + ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-[0-9]*.tar.gz) + TOOLS_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-tools-[0-9]*.tar.gz) + HEALTH_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-health-checking-[0-9]*.tar.gz) + REFLECTION_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-reflection-[0-9]*.tar.gz) fi VIRTUAL_ENV=$(mktemp -d) @@ -52,6 +54,14 @@ function at_least_one_installs() { at_least_one_installs "${ARCHIVES[@]}" at_least_one_installs "${TOOLS_ARCHIVES[@]}" +if [[ "$1" == "source" ]] +then + echo "Testing Python health and reflection packages" + at_least_one_installs "${HEALTH_ARCHIVES[@]}" + at_least_one_installs "${REFLECTION_ARCHIVES[@]}" +fi + + # # Test our distributions # diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py index bfb0a9e57f..80adc20184 100644 --- a/tools/run_tests/artifacts/distribtest_targets.py +++ b/tools/run_tests/artifacts/distribtest_targets.py @@ -167,15 +167,15 @@ class PythonDistribTest(object): if self.source: return create_docker_jobspec( self.name, - 'tools/dockerfile/distribtest/python_dev_%s_%s' % ( - self.docker_suffix, self.arch), + 'tools/dockerfile/distribtest/python_dev_%s_%s' % + (self.docker_suffix, self.arch), 'test/distrib/python/run_source_distrib_test.sh', copy_rel_path='test/distrib') else: return create_docker_jobspec( self.name, - 'tools/dockerfile/distribtest/python_%s_%s' % ( - self.docker_suffix, self.arch), + 'tools/dockerfile/distribtest/python_%s_%s' % + (self.docker_suffix, self.arch), 'test/distrib/python/run_binary_distrib_test.sh', copy_rel_path='test/distrib') |