21494: Clean test_doc
authorBrett Smith <brett.smith@curii.com>
Fri, 23 Feb 2024 16:54:34 +0000 (11:54 -0500)
committerBrett Smith <brett.smith@curii.com>
Fri, 23 Feb 2024 17:02:20 +0000 (12:02 -0500)
* 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 <brett.smith@curii.com>

build/run-tests.sh

index 17728c534230d22e3ff3014bb78f0c01d1999690..28e9e1cf7be17d98704a312f8841fa946db9fd43 100755 (executable)
@@ -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() {