fix output directory for Drupal 11.x tests

WengerK · Aug 20, 2024 · b04ac74 · b04ac74
1 parent 6f7677b
commit b04ac74
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 2 deletions.
diff --git a/11/11.0/Dockerfile b/11/11.0/Dockerfile
@@ -41,3 +41,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Copy a default template for PHPUnit testing.
 COPY templates/phpunit.xml /opt/drupal/web/phpunit.xml
+
+# Create the output directory for PHPUnit.
+RUN mkdir -p /opt/drupal/web/sites/default/files/simpletest/browser_output
+RUN chown www-data:www-data /opt/drupal/web/sites/default/files/simpletest/browser_output
diff --git a/11/11.0/templates/phpunit.xml b/11/11.0/templates/phpunit.xml
@@ -65,7 +65,7 @@
         overridden by the value set for the "BROWSERTEST_OUTPUT_DIRECTORY"
         environment variable.
       -->
-      <parameter name="outputDirectory" value="sites/simpletest/browser_output"/>
+      <parameter name="outputDirectory" value="/opt/drupal/web/sites/default/files/simpletest/browser_output"/>
       <!-- By default browser tests print the individual links in the test run
         report. To avoid overcrowding the output in CI environments, you can
         set the "verbose" parameter or the "BROWSERTEST_OUTPUT_VERBOSE"

diff --git a/11/11.0/tests/config.yaml b/11/11.0/tests/config.yaml
@@ -42,6 +42,8 @@ commandTests:
     command: 'phpunit'
     args: ['-c', '/var/www/html/phpunit.xml']
     exitCode: 0
+    expectedOutput: [ 'No tests executed!' ]
+    excludedOutput: [ 'is not a writable directory.' ]
 fileExistenceTests:
   - name: 'Root'
     path: '/'
@@ -70,3 +72,4 @@ fileExistenceTests:
     permissions: 'drwxr-xr-x'
     uid: 33
     gid: 33
+
diff --git a/11/11.1/Dockerfile b/11/11.1/Dockerfile
@@ -49,3 +49,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Copy a default template for PHPUnit testing.
 COPY templates/phpunit.xml /opt/drupal/web/phpunit.xml
+
+# Create the output directory for PHPUnit.
+RUN mkdir -p /opt/drupal/web/sites/default/files/simpletest/browser_output
+RUN chown www-data:www-data /opt/drupal/web/sites/default/files/simpletest/browser_output
diff --git a/11/11.1/templates/phpunit.xml b/11/11.1/templates/phpunit.xml
@@ -65,7 +65,7 @@
         overridden by the value set for the "BROWSERTEST_OUTPUT_DIRECTORY"
         environment variable.
       -->
-      <parameter name="outputDirectory" value="sites/simpletest/browser_output"/>
+      <parameter name="outputDirectory" value="/opt/drupal/web/sites/default/files/simpletest/browser_output"/>
       <!-- By default browser tests print the individual links in the test run
         report. To avoid overcrowding the output in CI environments, you can
         set the "verbose" parameter or the "BROWSERTEST_OUTPUT_VERBOSE"

diff --git a/11/11.1/tests/config.yaml b/11/11.1/tests/config.yaml
@@ -42,6 +42,8 @@ commandTests:
     command: 'phpunit'
     args: ['-c', '/var/www/html/phpunit.xml']
     exitCode: 0
+    expectedOutput: [ 'No tests executed!' ]
+    excludedOutput: [ 'is not a writable directory.' ]
 fileExistenceTests:
   - name: 'Root'
     path: '/'