Changeset 47125 for branches/5.3

Timestamp:

01/29/2020 03:20:38 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Build/Test Tools: Pass the TRAVIS_BRANCH and TRAVIS_PULL_REQUEST environment variables along to the Docker container.

This ensures that WP_UnitTestCase::skipOnAutomatedBranches() has access to these variables.

Correct the check for pull requests in WP_UnitTestCase_Base::skipOnAutomatedBranches().

Merges [46999], [47000], and [47001] to the 5.3 branch.
Fixes #49050.

Location:

branches/5.3

Files:

• . (modified) (1 prop)
• docker-compose.yml (modified) (1 diff)
• tests/phpunit/includes/abstract-testcase.php (modified) (1 diff)

branches/5.3/docker-compose.yml

@@ -106 +106 @@
       PHP_FPM_UID: ${PHP_FPM_UID-1000}
       PHP_FPM_GID: ${PHP_FPM_GID-1000}
+      TRAVIS_BRANCH: ${TRAVIS_BRANCH-false}
+      TRAVIS_PULL_REQUEST: ${TRAVIS_PULL_REQUEST-false}
 
     volumes:

branches/5.3/tests/phpunit/includes/abstract-testcase.php

@@ -187 +187 @@
      */
     public function skipOnAutomatedBranches() {
-        // gentenv can be disabled
-        if ( ! function_exists( 'getenv' ) ) {
-            return false;
-        }
-
         // https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
         $travis_branch       = getenv( 'TRAVIS_BRANCH' );
         $travis_pull_request = getenv( 'TRAVIS_PULL_REQUEST' );
 
-        if ( false !== $travis_pull_request && 'master' !== $travis_branch ) {
+        if ( ! $travis_branch || ! $travis_pull_request ) {
+            return;
+        }
+
+        if ( 'master' !== $travis_branch || 'false' !== $travis_pull_request ) {
             $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );
         }