Changeset 47000 for trunk/tests/phpunit/includes/abstract-testcase.php

Timestamp:

12/20/2019 01:10:23 AM (5 years ago)

Author:

SergeyBiryukov

Message:

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

Mark the test as failed if the environment variables are unavailable.

Fixes #49050.

File:

• trunk/tests/phpunit/includes/abstract-testcase.php (modified) (1 diff)

trunk/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 ) {
+            $this->fail( 'Could not read TRAVIS_BRANCH or TRAVIS_PULL_REQUEST' );
+        }
+
+        if ( 'master' !== $travis_branch || 'false' !== $travis_pull_request ) {
             $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );
         }