diff --git a/scripts/check-phase19.4.sh b/scripts/check-phase19.4.sh index 74f1d74b..330eb9e6 100755 --- a/scripts/check-phase19.4.sh +++ b/scripts/check-phase19.4.sh @@ -97,8 +97,9 @@ PLUGIN_TESTS=( TestAdminSurfaceHidesCredentials TestImportKeyDirErrorsNameNoKey TestParityFixturesHoldNoSecrets + # Plan 04: the D-14 map, the zero-edit port and the Docker-free internals. + TestPHPMethodMap TestZeroEditAdditivity TestBrandingSanitisers TestBuckets TestScheduleConfig ) -PLUGIN_CONSOLE_TESTS=() # userplugin stage: the user plugin's Docker-free suites (-short), by # package pattern relative to the application workspace. @@ -127,8 +128,11 @@ DOCKER_PLUGIN_TESTS=( TestUserDeleteCascade # Plan 04: Go-only. TestConsentRedirectMode + # Plan 04: the PHP unit cases and the plugin's internals. + TestClaimBuilder TestDiscoveryDocument TestKeyRing TestPruneExpired TestSubjectStability + TestKeyRingMultiInstanceRace TestKeyRingPreviousAppKey TestMCPStore + TestImportWinter TestImportKeyDirErrors TestRotateKeysCommand ) -DOCKER_PLUGIN_CONSOLE_TESTS=() DOCKER_USER_CLASSES_TESTS=() DOCKER_USER_ROOT_TESTS=() # The application's OAuth suites on Postgres (D-09), the explicit resource @@ -418,10 +422,9 @@ run_plugin() { go_vet "$OAUTHSERVER_PLUGIN" ./... # The Docker suites skip here and run by name in the docker stage. go_short "$OAUTHSERVER_PLUGIN" - go_named "$OAUTHSERVER_PLUGIN" . -short "${PLUGIN_TESTS[@]}" - if ((${#PLUGIN_CONSOLE_TESTS[@]})); then - go_named "$OAUTHSERVER_PLUGIN" ./console -short "${PLUGIN_CONSOLE_TESTS[@]}" - fi + # The map checks wristband's test sources and the zero-edit port the user + # plugin checkout: point both at this run's checkouts. + SUMMERCMS_ROOT="$ROOT" USER_PLUGIN="$USER_PLUGIN" go_named "$OAUTHSERVER_PLUGIN" . -short "${PLUGIN_TESTS[@]}" echo "phase19.4 plugin passed" } @@ -481,10 +484,7 @@ run_docker() { fi require_dir "$OAUTHSERVER_PLUGIN" "OAuth server plugin" require_dir "$FONOTEKA" "application workspace" - go_named "$OAUTHSERVER_PLUGIN" . "-timeout 30m" "${DOCKER_PLUGIN_TESTS[@]}" - if ((${#DOCKER_PLUGIN_CONSOLE_TESTS[@]})); then - go_named "$OAUTHSERVER_PLUGIN" ./console "-timeout 20m" "${DOCKER_PLUGIN_CONSOLE_TESTS[@]}" - fi + 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