From eb0813ea3529a00866fb08105c3a5a01612289e9 Mon Sep 17 00:00:00 2001 From: Robert Nishihara Date: Thu, 26 Dec 2019 22:34:56 -0800 Subject: [PATCH] Re-enable UI tests for wheels. (#6602) --- ci/travis/test-wheels.sh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/ci/travis/test-wheels.sh b/ci/travis/test-wheels.sh index e0a3bbdd7..1e22e6e7a 100755 --- a/ci/travis/test-wheels.sh +++ b/ci/travis/test-wheels.sh @@ -21,8 +21,8 @@ else exit 1 fi -# TEST_SCRIPT="tests/test_microbenchmarks.py" -# UI_TEST_SCRIPT="tests/test_webui.py" +TEST_SCRIPT="$TRAVIS_BUILD_DIR/python/ray/tests/test_microbenchmarks.py" +UI_TEST_SCRIPT="$TRAVIS_BUILD_DIR/python/ray/tests/test_webui.py" if [[ "$platform" == "linux" ]]; then # First test Python 2.7. @@ -42,7 +42,7 @@ if [[ "$platform" == "linux" ]]; then # Run a simple test script to make sure that the wheel works. INSTALLED_RAY_DIRECTORY=$(dirname "$($PYTHON_EXE -u -c "import ray; print(ray.__file__)" | tail -n1)") - # $PYTHON_EXE -m pytest -v "$INSTALLED_RAY_DIRECTORY/$TEST_SCRIPT" + $PYTHON_EXE "$TEST_SCRIPT" # Now test Python 3.6. @@ -61,11 +61,11 @@ if [[ "$platform" == "linux" ]]; then # Run a simple test script to make sure that the wheel works. INSTALLED_RAY_DIRECTORY=$(dirname "$($PYTHON_EXE -u -c "import ray; print(ray.__file__)" | tail -n1)") - # $PYTHON_EXE -m pytest -v "$INSTALLED_RAY_DIRECTORY/$TEST_SCRIPT" + $PYTHON_EXE "$TEST_SCRIPT" # Run the UI test to make sure that the packaged UI works. - # $PIP_CMD install -q aiohttp google grpcio psutil requests setproctitle - # $PYTHON_EXE -m pytest -v "$INSTALLED_RAY_DIRECTORY/$UI_TEST_SCRIPT" + $PIP_CMD install -q aiohttp google grpcio psutil requests setproctitle + $PYTHON_EXE "$UI_TEST_SCRIPT" # Check that the other wheels are present. NUMBER_OF_WHEELS=$(ls -1q "$ROOT_DIR"/../../.whl/*.whl | wc -l) @@ -102,13 +102,14 @@ elif [[ "$platform" == "macosx" ]]; then # Run a simple test script to make sure that the wheel works. INSTALLED_RAY_DIRECTORY=$(dirname "$($PYTHON_EXE -u -c "import ray; print(ray.__file__)" | tail -n1)") - # $PYTHON_EXE -m pytest -v "$INSTALLED_RAY_DIRECTORY/$TEST_SCRIPT" + $PYTHON_EXE "$TEST_SCRIPT" - # if (( $(echo "$PY_MM >= 3.0" | bc) )); then + if (( $(echo "$PY_MM >= 3.0" | bc) )); then # Run the UI test to make sure that the packaged UI works. - # $PIP_CMD install -q aiohttp google grpcio psutil requests setproctitle - # $PYTHON_EXE -m pytest -v "$INSTALLED_RAY_DIRECTORY/$UI_TEST_SCRIPT" - # fi + $PIP_CMD install -q aiohttp google grpcio psutil requests setproctitle + $PYTHON_EXE "$UI_TEST_SCRIPT" + fi + done else echo "Unrecognized environment."