diff --git a/scripts/check-phase19.4.sh b/scripts/check-phase19.4.sh index 330eb9e6..682c7de7 100755 --- a/scripts/check-phase19.4.sh +++ b/scripts/check-phase19.4.sh @@ -103,8 +103,7 @@ PLUGIN_TESTS=( # userplugin stage: the user plugin's Docker-free suites (-short), by # package pattern relative to the application workspace. -USER_CLASSES_TESTS=() -USER_ROOT_TESTS=() +USER_ROOT_TESTS=(TestEndRequestSession) # fonoteka stage: the application's Docker-free OAuth suites (-short). APP_OAUTH_TESTS=( @@ -133,8 +132,7 @@ DOCKER_PLUGIN_TESTS=( TestKeyRingMultiInstanceRace TestKeyRingPreviousAppKey TestMCPStore TestImportWinter TestImportKeyDirErrors TestRotateKeysCommand ) -DOCKER_USER_CLASSES_TESTS=() -DOCKER_USER_ROOT_TESTS=() +DOCKER_USER_ROOT_TESTS=(TestRequestUser TestAvatarURL TestDeactivatingEvent) # The application's OAuth suites on Postgres (D-09), the explicit resource # of plan 01 included. DOCKER_APP_OAUTH_TESTS=( @@ -439,12 +437,7 @@ run_userplugin() { require_dir "$FONOTEKA" "application workspace" go_vet "$FONOTEKA" ./plugins/golem15/user/... go_short "$FONOTEKA" ./plugins/golem15/user/... - if ((${#USER_CLASSES_TESTS[@]})); then - go_named "$FONOTEKA" ./plugins/golem15/user/classes -short "${USER_CLASSES_TESTS[@]}" - fi - if ((${#USER_ROOT_TESTS[@]})); then - go_named "$FONOTEKA" ./plugins/golem15/user -short "${USER_ROOT_TESTS[@]}" - fi + go_named "$FONOTEKA" ./plugins/golem15/user -short "${USER_ROOT_TESTS[@]}" # D-05: additive only. git's status is captured before any filtering, so # an unknown base or a broken checkout fails here instead of reading as # an empty diff. @@ -485,12 +478,7 @@ run_docker() { require_dir "$OAUTHSERVER_PLUGIN" "OAuth server plugin" require_dir "$FONOTEKA" "application workspace" SUMMERCMS_ROOT="$ROOT" go_named "$OAUTHSERVER_PLUGIN" . "-timeout 30m" "${DOCKER_PLUGIN_TESTS[@]}" - if ((${#DOCKER_USER_CLASSES_TESTS[@]})); then - go_named "$FONOTEKA" ./plugins/golem15/user/classes "-timeout 20m" "${DOCKER_USER_CLASSES_TESTS[@]}" - fi - if ((${#DOCKER_USER_ROOT_TESTS[@]})); then - go_named "$FONOTEKA" ./plugins/golem15/user "-timeout 20m" "${DOCKER_USER_ROOT_TESTS[@]}" - fi + go_named "$FONOTEKA" ./plugins/golem15/user "-timeout 20m" "${DOCKER_USER_ROOT_TESTS[@]}" go_named "$FONOTEKA" ./plugins/golem15/fono""teka "-timeout 20m" "${DOCKER_APP_OAUTH_TESTS[@]}" echo "phase19.4 docker passed" }