Changeset 40249 for branches/4.6

Timestamp:

03/08/2017 12:50:43 AM (8 years ago)

Author:

johnbillion

Message:

Build/Test tools: In Travis, skip some tests when not on trunk.

This skips time sensitive tests (copyright year and PHP/MySQL version requirements) when tests are run on branches on Travis.

Props netweb, jorbin

Fixes #39486

Merges [40241] to the 4.6 branch.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• tests/phpunit/includes/testcase.php (modified) (1 diff)
• tests/phpunit/tests/basic.php (modified) (1 diff)
• tests/phpunit/tests/external-http/basic.php (modified) (1 diff)

branches/4.6/tests/phpunit/includes/testcase.php

@@ -160 +160 @@
         $_POST = array();
         $this->flush_cache();
+    }
+
+    /**
+     * 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.
+     */
+    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 ) {
+            $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );
+        }
     }
 

branches/4.6/tests/phpunit/tests/basic.php

@@ -8 +8 @@
 
     function test_license() {
+        // This test is designed to only run on trunk/master
+        $this->skipOnAutomatedBranches();
+
         $license = file_get_contents( ABSPATH . 'license.txt' );
         preg_match( '#Copyright 2011-(\d+) by the contributors#', $license, $matches );

branches/4.6/tests/phpunit/tests/external-http/basic.php

@@ -6 +6 @@
 
     function test_readme() {
+        // This test is designed to only run on trunk/master
+        $this->skipOnAutomatedBranches();
+
         $readme = file_get_contents( ABSPATH . 'readme.html' );
         preg_match( '#<br /> Version (.*)#', $readme, $matches );