From a1d52c20e1f911df998543ad642d5d27d5cd0f62 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Fri, 23 Feb 2024 11:54:34 -0500 Subject: [PATCH] 21494: Clean test_doc * Use local variables and `env -C` to preserve global state, instead of a subshell. * Remove outdated python-epydoc comment. * Remove PYTHONPATH setting. It's unnecessary now that we run inside a virtualenv with PySDK installed. Refs #21494. Arvados-DCO-1.1-Signed-off-by: Brett Smith --- build/run-tests.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build/run-tests.sh b/build/run-tests.sh index 17728c5342..28e9e1cf7b 100755 --- a/build/run-tests.sh +++ b/build/run-tests.sh @@ -987,14 +987,13 @@ install_services/workbench2() { } test_doc() { - ( - set -e - cd "$WORKSPACE/doc" - ARVADOS_API_HOST=pirca.arvadosapi.com - # Make sure python-epydoc is installed or the next line won't - # do much good! - PYTHONPATH=$WORKSPACE/sdk/python/ "$bundle" exec rake linkchecker baseurl=file://$WORKSPACE/doc/.site/ arvados_workbench_host=https://workbench.$ARVADOS_API_HOST arvados_api_host=$ARVADOS_API_HOST ${testargs[doc]} - ) + local arvados_api_host=pirca.arvadosapi.com && \ + env -C "$WORKSPACE/doc" \ + "$bundle" exec rake linkchecker \ + arvados_api_host="$arvados_api_host" \ + arvados_workbench_host="https://workbench.$arvados_api_host" \ + baseurl="file://$WORKSPACE/doc/.site/" \ + ${testargs[doc]} } test_gofmt() { -- 2.30.2