Fix drush tests

wodby · Mar 8, 2024 · bac7ec7 · bac7ec7
1 parent 1ccf79b
commit bac7ec7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/tests/10/tests.sh b/tests/10/tests.sh
@@ -24,10 +24,6 @@ run_action() {
   make "${@}" -f /usr/local/bin/actions.mk
 }
 
-echo -n "Checking drush... "
-drush version --format=yaml
-echo "OK"
-
 echo -n "Checking environment variables... "
 env | grep -q ^DOCROOT_SUBDIR=
 env | grep -q ^DRUPAL_VERSION=
@@ -52,6 +48,10 @@ COMPOSER_MEMORY_LIMIT=-1 composer install -n
 composer require drush/drush
 composer require drupal/redis
 
+echo -n "Checking drush... "
+drush version --format=yaml
+echo "OK"
+
 cd "${DRUPAL_ROOT}"
 
 run_action files-import source="${FILES_ARCHIVE_URL}"

diff --git a/tests/7/tests.sh b/tests/7/tests.sh
@@ -28,10 +28,6 @@ run_action() {
     make "${@}" -f /usr/local/bin/actions.mk
 }
 
-echo -n "Checking drush... "
-drush version --format=yaml
-echo "OK"
-
 echo -n "Checking environment variables... "
 env | grep -q ^DOCROOT_SUBDIR=
 env | grep -q ^DRUPAL_VERSION=
@@ -58,7 +54,11 @@ cd "${DRUPAL_ROOT}"
 run_action files-import source="${FILES_ARCHIVE_URL}"
 run_action init-drupal
 
-drush si -y --db-url="${DB_DRIVER}://${DB_USER}:${DB_PASSWORD}@${DB_HOST}/${DB_NAME}"
+echo -n "Checking drush... "
+drush version --format=yaml
+echo "OK"
+
+drush si -vvv -y --db-url="${DB_DRIVER}://${DB_USER}:${DB_PASSWORD}@${DB_HOST}/${DB_NAME}"
 drush en varnish redis -y --quiet
 
 run_action cache-clear