<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[40239] trunk: Build/Test tools: In Travis, skip some tests when not on trunk.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/40239">40239</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/40239","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-03-08 00:00:47 +0000 (Wed, 08 Mar 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/39486">#39486</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunktestsphpunitincludesfunctionsphp">trunk/tests/phpunit/includes/functions.php</a></li>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
<li><a href="#trunktestsphpunittestsbasicphp">trunk/tests/phpunit/tests/basic.php</a></li>
<li><a href="#trunktestsphpunittestsexternalhttpbasicphp">trunk/tests/phpunit/tests/external-http/basic.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2017-03-07 05:47:32 UTC (rev 40238)
+++ trunk/src/wp-includes/pluggable.php 2017-03-08 00:00:47 UTC (rev 40239)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -900,6 +900,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Allows preventing auth cookies from actually being sent to the client.
+ *
+ * @since 4.7.4
+ *
+ * @param bool $send Whether to send auth cookies to the client.
+ */
+ if ( ! apply_filters( 'send_auth_cookies', true ) ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
</span><span class="cx" style="display: block; padding: 0 10px"> setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
</span><span class="cx" style="display: block; padding: 0 10px"> setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -922,6 +933,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'clear_auth_cookie' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Allows preventing auth cookies from actually being sent to the client.
+ *
+ * @since 4.7.4
+ *
+ * @param bool $send Whether to send auth cookies to the client.
+ */
+ if ( ! apply_filters( 'send_auth_cookies', true ) ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> setcookie( AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN );
</span><span class="cx" style="display: block; padding: 0 10px"> setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN );
</span><span class="cx" style="display: block; padding: 0 10px"> setcookie( AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN );
</span></span></pre></div>
<a id="trunktestsphpunitincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/functions.php 2017-03-07 05:47:32 UTC (rev 40238)
+++ trunk/tests/phpunit/includes/functions.php 2017-03-08 00:00:47 UTC (rev 40239)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,21 +164,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Skip `setcookie` calls in auth_cookie functions due to warning:
</span><span class="cx" style="display: block; padding: 0 10px"> // Cannot modify header information - headers already sent by ...
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token = '' ) {
- $auth_cookie = null;
- $expire = null;
- $expiration = null;
- $user_id = null;
- $scheme = null;
- /** This action is documented in wp-inclues/pluggable.php */
- do_action( 'set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme );
- $logged_in_cookie = null;
- /** This action is documented in wp-inclues/pluggable.php */
- do_action( 'set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in' );
-}
-
-function wp_clear_auth_cookie() {
- /** This action is documented in wp-inclues/pluggable.php */
- do_action( 'clear_auth_cookie' );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+tests_add_filter( 'send_auth_cookies', '__return_false' );
</ins></span></pre></div>
<a id="trunktestsphpunitincludestestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/testcase.php 2017-03-07 05:47:32 UTC (rev 40238)
+++ trunk/tests/phpunit/includes/testcase.php 2017-03-08 00:00:47 UTC (rev 40239)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,6 +177,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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' );
+ }
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Unregister existing post types and register defaults.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Run before each test in order to clean up the global scope, in case
</span></span></pre></div>
<a id="trunktestsphpunittestsbasicphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/basic.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/basic.php 2017-03-07 05:47:32 UTC (rev 40238)
+++ trunk/tests/phpunit/tests/basic.php 2017-03-08 00:00:47 UTC (rev 40239)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,6 +8,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Basic extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_license() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This test is designed to only run on trunk/master
+ $this->skipOnAutomatedBranches();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $license = file_get_contents( ABSPATH . 'license.txt' );
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match( '#Copyright 2011-(\d+) by the contributors#', $license, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> $this_year = date( 'Y' );
</span></span></pre></div>
<a id="trunktestsphpunittestsexternalhttpbasicphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/external-http/basic.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/external-http/basic.php 2017-03-07 05:47:32 UTC (rev 40238)
+++ trunk/tests/phpunit/tests/external-http/basic.php 2017-03-08 00:00:47 UTC (rev 40239)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,6 +5,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_External_HTTP_Basic extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_readme() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This test is designed to only run on trunk/master
+ $this->skipOnAutomatedBranches();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $readme = file_get_contents( ABSPATH . 'readme.html' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match( '#Recommendations.*PHP</a> version <strong>([0-9.]*)#s', $readme, $matches );
</span></span></pre>
</div>
</div>
</body>
</html>