Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for failing integration tests. #76

Merged
merged 2 commits into from
Nov 12, 2024
Merged

Fix for failing integration tests. #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3bdffa
Fix for failing integration tests.
nigelgbanks Nov 12, 2024
6e100a4
Wait for site to be installed before running tests
nigelgbanks Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions drupal/rootfs/etc/s6-overlay/scripts/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ source /etc/islandora/utilities.sh
readonly SITE="default"

function configure {
# Work around for when the cache is in a bad state, as Drush will access
# the cache before rebuilding it for some dumb reason, preventing
# Drush from being able to clear it.
local params=$(/var/www/drupal/web/core/scripts/rebuild_token_calculator.sh 2>/dev/null)
curl -L "${DRUPAL_DRUSH_URI}/core/rebuild.php?${params}"
# Starter site post install steps.
drush --root=/var/www/drupal --uri="${DRUPAL_DRUSH_URI}" cache:rebuild
drush --root=/var/www/drupal --uri="${DRUPAL_DRUSH_URI}" user:role:add fedoraadmin admin
Expand Down
3 changes: 3 additions & 0 deletions tests/init-template-starter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ cp ./tests/solr.php drupal/rootfs/var/www/drupal/

docker compose --profile dev up -d

echo "Waiting for installation..."
docker compose --profile dev exec drupal-dev timeout 600 bash -c "while ! test -f /installed; do sleep 5; done"

./tests/ping.sh

docker compose --profile dev exec drupal-dev drush scr solr.php
Loading