Remove test-runner and Disable XDebug with XDEBUG_MODE: off #441

.github/workflows/run-tests.yml

@@ -59,15 +59,15 @@ jobs:
           docker-compose -f docker-compose.testing.common.yml -f docker-compose.testing.${{ matrix.dbms }}.yml config > docker-compose.yml
       - name: Start containers
         run: docker-compose up -d
-      - name: Wait until test-runner container is ready
-      # The test-runner-container-fs-ready file is only created once we expect the containers to be online
+      - name: Wait until www container is ready
+      # The www-container-fs-ready file is only created once we expect the containers to be online
       # so waiting for that lets us know it is safe to start the tests
-        run: until [ -f ./www/test-runner-container-fs-ready ]; do sleep 0.1; done
+        run: until [ -f ./www/www-container-fs-ready ]; do sleep 0.1; done
       - name: Run PHP CodeSniffer
         run: docker-compose exec -u www-data -T www phpcs /opt/drupal/web/profiles/farm
       - name: Run PHPUnit tests
       # The overridden result printer is needed until Drupal 9.2 when the updated version of HtmlOutputPrinter will be available
       # https://github.com/drupal/drupal/blob/74fbb0aabdee3e1a5da7b8e489a725afdc5824fd/core/tests/Drupal/Tests/Listeners/HtmlOutputPrinter.php
-        run: docker-compose exec -u www-data -T test-runner paratest --passthru='--printer=PHPUnit\\TextUI\\DefaultResultPrinter' --verbose=1 /opt/drupal/web/profiles/farm
+        run: docker-compose exec -u www-data -T www paratest --passthru='--printer=PHPUnit\\TextUI\\DefaultResultPrinter' --verbose=1 /opt/drupal/web/profiles/farm
       - name: Test Drush site install with all modules
         run: docker-compose exec -u www-data -T www drush site-install --db-url=${{ matrix.DB_URL }} farm farm.modules='all'

docker/docker-compose.testing.common.yml

@@ -6,28 +6,8 @@ services:
       - './www:/opt/drupal'
     environment:
       FARMOS_FS_READY_SENTINEL_FILENAME: /opt/drupal/www-container-fs-ready
+      SIMPLETEST_DB: $DB_URL
+      XDEBUG_MODE: 'off'
 
   chrome:
     image: selenium/standalone-chrome:latest
-
-  test-runner:
-    depends_on:
-      - www
-      - chrome
-    image: farmos/farmos:2.x
-    entrypoint: /bin/bash
-    command:
-      - -c
-      - |
-        set -e
-        # Wait until the dev farmOS container has finished copying its files
-        until [ -f /opt/drupal/www-container-fs-ready ]; do sleep 0.1; done
-        # Run normal entrypoint and apache - only at this point is the test-runner-container-fs-ready
-        # file created, allowing the Github action to also wait for the above conditions on the basis
-        # of that file's creation.
-        exec docker-entrypoint.sh apache2-foreground
-    volumes:
-      - './www:/opt/drupal'
-    environment:
-      FARMOS_FS_READY_SENTINEL_FILENAME: /opt/drupal/test-runner-container-fs-ready
-      SIMPLETEST_DB: $DB_URL

docker/docker-compose.testing.mariadb.yml

@@ -16,17 +16,3 @@ services:
   www:
     depends_on:
       - db
-
-  test-runner:
-    command:
-      - -c
-      - |
-        set -e
-        # Wait until the dev farmOS container has finished copying its files
-        until [ -f /opt/drupal/www-container-fs-ready ]; do sleep 0.1; done
-        # Wait until mariadb is online listening to its socket
-        while { ! exec 3<>/dev/tcp/db/3306; } > /dev/null 2>&1; do sleep 0.1; done
-        # Run normal entrypoint and apache - only at this point is the test-runner-container-fs-ready
-        # file created, allowing the Github action to also wait for the above conditions on the basis
-        # of that file's creation.
-        exec docker-entrypoint.sh apache2-foreground

docker/docker-compose.testing.pgsql.yml

@@ -15,17 +15,3 @@ services:
   www:
     depends_on:
       - db
-
-  test-runner:
-    command:
-      - -c
-      - |
-        set -e
-        # Wait until the dev farmOS container has finished copying its files
-        until [ -f /opt/drupal/www-container-fs-ready ]; do sleep 0.1; done
-        # Wait until Postgres is online listening to its socket
-        while { ! exec 3<>/dev/tcp/db/5432; } > /dev/null 2>&1; do sleep 0.1; done
-        # Run normal entrypoint and apache - only at this point is the test-runner-container-fs-ready
-        # file created, allowing the Github action to also wait for the above conditions on the basis
-        # of that file's creation.
-        exec docker-entrypoint.sh apache2-foreground

docker/docker-compose.testing.sqlite.yml

@@ -1,14 +1,3 @@
 # Inherits from docker-compose.testing.common.yml
 version: '3'
-services:
-  test-runner:
-    command:
-      - -c
-      - |
-        set -e
-        # Wait until the dev farmOS container has finished copying its files
-        until [ -f /opt/drupal/www-container-fs-ready ]; do sleep 0.1; done
-        # Run normal entrypoint and apache - only at this point is the test-runner-container-fs-ready
-        # file created, allowing the Github action to also wait for the above conditions on the basis
-        # of that file's creation.
-        exec docker-entrypoint.sh apache2-foreground
+services: {  }