test seems to be working

rfay · rfay · commit 1ba0a7c19f85 · 2023-11-25T12:38:21.000-07:00
diff --git a/config.php-patch-build.yaml b/config.php-patch-build.yaml
@@ -6,6 +6,5 @@ hooks:
     - exec: sudo ln -sf /usr/local/src/static-php-cli/buildroot/bin/php-fpm /usr/sbin/php-fpm
     - exec: sudo ln -sf /etc/php/${STATIC_PHP_VERSION%.*}/cli/php.ini /etc/php.ini
     - exec: sudo ln -sf /etc/php/${STATIC_PHP_VERSION%.*}/fpm/php-fpm.conf /etc/php-fpm.conf
-    - exec: "killall -HUP supervisord && rm -f /tmp/healthy && sleep 1 && ( /healthcheck.sh || true )"
-    - exec-host: while ! docker inspect --format='{{.State.Health.Status}}' ddev-${DDEV_PROJECT}-web | grep -q "healthy"; do sleep 1; done
+    - exec: "killall -HUP supervisord && rm -f /tmp/healthy && while true; do sleep 1; if /healthcheck.sh >/dev/null; then break; fi; done"
 
diff --git a/tests/test.bats b/tests/test.bats
@@ -33,8 +33,8 @@ health_checks() {
 teardown() {
   set -eu -o pipefail
   cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 )
-#  ddev delete -Oy ${PROJNAME} >/dev/null 2>&1
-#  [ "${TESTDIR}" != "" ] && rm -rf ${TESTDIR}
+  ddev delete -Oy ${PROJNAME} >/dev/null 2>&1
+  [ "${TESTDIR}" != "" ] && rm -rf ${TESTDIR}
 }
 
 @test "install from directory" {
