Changeset 49264

Timestamp:

10/21/2020 02:05:39 PM (6 years ago)

Author:

desrosj

Message:

Build/Test Tools: Skip some tests when not in the primary branch.

This skips time sensitive tests when GitHub Actions workflows are not being run on master branch.

See #50401, #39486.

File:

• trunk/tests/phpunit/includes/abstract-testcase.php (modified) (2 diffs)

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -182 +182 @@
          * Allow tests to be skipped on some automated runs.
          *
-         * For test runs on Travis for something other than trunk/master
-         * we want to skip tests that only need to run for master.
+         * For test runs on Travis/GitHub Actions for something other than trunk/master, we want to skip tests that
+         * only need to run for master.
          */
         public function skipOnAutomatedBranches() {
@@ -190 +190 @@
                 $travis_pull_request = getenv( 'TRAVIS_PULL_REQUEST' );
 
-                if ( ! $travis_branch || ! $travis_pull_request ) {
+                // https://docs.github.com/en/free-pro-team@latest/actions/reference/environment-variables#default-environment-variables
+                $github_event_name = getenv( 'GITHUB_EVENT_NAME' );
+                $github_ref        = getenv( 'GITHUB_REF' );
+
+                if ( ( ! $travis_branch || ! $travis_pull_request ) && ! $github_event_name ) {
                         return;
                 }
 
-                if ( 'master' !== $travis_branch || 'false' !== $travis_pull_request ) {
+                if ( ( 'master' !== $travis_branch || 'false' !== $travis_pull_request ) && empty( $github_event_name ) ) {
+                        $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );
+                } elseif ( in_array( $github_event_name, array( 'pull_request', 'pull_request_target' ), true ) || 'refs/heads/master' !== $github_ref ) {
                         $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );
                 }