From 1a92cd0b52127bda66e9669462a17b8cce5da01a Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Wed, 20 Jun 2018 09:23:14 -0700 Subject: More consistent source/binary Python distribtests --- test/distrib/python/test_packages.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'test/distrib') diff --git a/test/distrib/python/test_packages.sh b/test/distrib/python/test_packages.sh index 6bf49d45b9..6c3a51c69d 100755 --- a/test/distrib/python/test_packages.sh +++ b/test/distrib/python/test_packages.sh @@ -28,10 +28,11 @@ else echo "Testing Python source distribution" 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 +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) + VIRTUAL_ENV=$(mktemp -d) virtualenv "$VIRTUAL_ENV" PYTHON=$VIRTUAL_ENV/bin/python @@ -53,13 +54,8 @@ 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 +at_least_one_installs "${HEALTH_ARCHIVES[@]}" +at_least_one_installs "${REFLECTION_ARCHIVES[@]}" # -- cgit v1.2.3 From 2cb912c71621194b3d4d72ffbe841a480eb24f16 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Wed, 20 Jun 2018 09:23:48 -0700 Subject: Add grpcio-testing to Python distribtests --- test/distrib/python/test_packages.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test/distrib') diff --git a/test/distrib/python/test_packages.sh b/test/distrib/python/test_packages.sh index 6c3a51c69d..755daa1021 100755 --- a/test/distrib/python/test_packages.sh +++ b/test/distrib/python/test_packages.sh @@ -32,6 +32,7 @@ fi 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) +TESTING_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-testing-[0-9]*.tar.gz) VIRTUAL_ENV=$(mktemp -d) virtualenv "$VIRTUAL_ENV" @@ -56,6 +57,7 @@ at_least_one_installs "${ARCHIVES[@]}" at_least_one_installs "${TOOLS_ARCHIVES[@]}" at_least_one_installs "${HEALTH_ARCHIVES[@]}" at_least_one_installs "${REFLECTION_ARCHIVES[@]}" +at_least_one_installs "${TESTING_ARCHIVES[@]}" # -- cgit v1.2.3