<!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>[26252] trunk: For unit tests that call `wpmu_create_blog()`, Blog factory, or installation code that attempts to clear transients: suppress database errors on `setUp` and restore on `tearDown`.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26252">26252</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-11-18 20:44:34 +0000 (Mon, 18 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>For unit tests that call `wpmu_create_blog()`, Blog factory, or installation code that attempts to clear transients: suppress database errors on `setUp` and restore on `tearDown`.
There are a few places in core that were preventing this from working by explicity setting `$wpdb->suppress_errors` to `false`. Instead, they should inherit the value that existed before errors were suppressed.
This allows Multisite unit tests to run without explosive database errors, and allows `$wpdb->suppress_errors` to be overridden all the way down the chain.
Fixes <a href="http://core.trac.wordpress.org/ticket/26102">#26102</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryphp">trunk/tests/phpunit/includes/factory.php</a></li>
<li><a href="#trunktestsphpunittestsmsphp">trunk/tests/phpunit/tests/ms.php</a></li>
<li><a href="#trunktestsphpunittestsoptionblogOptionphp">trunk/tests/phpunit/tests/option/blogOption.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/upgrade.php (26251 => 26252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/upgrade.php 2013-11-18 20:18:57 UTC (rev 26251)
+++ trunk/src/wp-admin/includes/upgrade.php 2013-11-18 20:44:34 UTC (rev 26252)
</span><span class="lines">@@ -1553,9 +1553,9 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // Fetch the table column structure from the database
</span><del>- $wpdb->suppress_errors();
</del><ins>+ $suppress = $wpdb->suppress_errors();
</ins><span class="cx"> $tablefields = $wpdb->get_results("DESCRIBE {$table};");
</span><del>- $wpdb->suppress_errors( false );
</del><ins>+ $wpdb->suppress_errors( $suppress );
</ins><span class="cx">
</span><span class="cx"> if ( ! $tablefields )
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/ms-functions.php (26251 => 26252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/ms-functions.php 2013-11-18 20:18:57 UTC (rev 26251)
+++ trunk/src/wp-includes/ms-functions.php 2013-11-18 20:44:34 UTC (rev 26252)
</span><span class="lines">@@ -1129,10 +1129,10 @@
</span><span class="cx">
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</span><span class="cx">
</span><del>- $wpdb->suppress_errors();
</del><ins>+ $suppress = $wpdb->suppress_errors();
</ins><span class="cx"> if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) )
</span><span class="cx"> die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
</span><del>- $wpdb->suppress_errors( false );
</del><ins>+ $wpdb->suppress_errors( $suppress );
</ins><span class="cx">
</span><span class="cx"> $url = get_blogaddress_by_id( $blog_id );
</span><span class="cx">
</span><span class="lines">@@ -1179,11 +1179,11 @@
</span><span class="cx">
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</span><span class="cx">
</span><del>- $wpdb->suppress_errors();
</del><ins>+ $suppress = $wpdb->suppress_errors();
</ins><span class="cx">
</span><span class="cx"> wp_install_defaults($user_id);
</span><span class="cx">
</span><del>- $wpdb->suppress_errors( false );
</del><ins>+ $wpdb->suppress_errors( $suppress );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunktestsphpunitincludesfactoryphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/includes/factory.php (26251 => 26252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/includes/factory.php 2013-11-18 20:18:57 UTC (rev 26251)
+++ trunk/tests/phpunit/includes/factory.php 2013-11-18 20:44:34 UTC (rev 26252)
</span><span class="lines">@@ -159,9 +159,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function create_object( $args ) {
</span><ins>+ global $wpdb;
</ins><span class="cx"> $meta = isset( $args['meta'] ) ? $args['meta'] : array();
</span><span class="cx"> $user_id = isset( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
</span><del>- return wpmu_create_blog( $args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id'] );
</del><ins>+ // temp tables will trigger db errors when we attempt to reference them as new temp tables
+ $suppress = $wpdb->suppress_errors();
+ $blog = wpmu_create_blog( $args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id'] );
+ $wpdb->suppress_errors( $suppress );
+ return $blog;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function update_object( $blog_id, $fields ) {}
</span></span></pre></div>
<a id="trunktestsphpunittestsmsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/ms.php (26251 => 26252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/ms.php 2013-11-18 20:18:57 UTC (rev 26251)
+++ trunk/tests/phpunit/tests/ms.php 2013-11-18 20:44:34 UTC (rev 26252)
</span><span class="lines">@@ -9,13 +9,22 @@
</span><span class="cx"> */
</span><span class="cx"> class Tests_MS extends WP_UnitTestCase {
</span><span class="cx"> protected $plugin_hook_count = 0;
</span><ins>+ protected $suppress = false;
</ins><span class="cx">
</span><span class="cx"> function setUp() {
</span><ins>+ global $wpdb;
</ins><span class="cx"> parent::setUp();
</span><ins>+ $this->suppress = $wpdb->suppress_errors();
</ins><span class="cx">
</span><span class="cx"> $_SERVER['REMOTE_ADDR'] = '';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function tearDown() {
+ global $wpdb;
+ parent::tearDown();
+ $wpdb->suppress_errors( $this->suppress );
+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * @ticket 22917
</span><span class="cx"> */
</span><span class="lines">@@ -105,9 +114,9 @@
</span><span class="cx"> $this->assertEquals( $details, wp_cache_get( $key, 'blog-lookup' ) );
</span><span class="cx">
</span><span class="cx"> foreach ( $wpdb->tables( 'blog', false ) as $table ) {
</span><del>- $wpdb->suppress_errors();
</del><ins>+ $suppress = $wpdb->suppress_errors();
</ins><span class="cx"> $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
</span><del>- $wpdb->suppress_errors( false );
</del><ins>+ $wpdb->suppress_errors( $suppress );
</ins><span class="cx"> $this->assertNotEmpty( $table_fields );
</span><span class="cx"> $result = $wpdb->get_results( "SELECT * FROM $prefix$table LIMIT 1" );
</span><span class="cx"> if ( 'commentmeta' == $table || 'links' == $table )
</span><span class="lines">@@ -139,9 +148,9 @@
</span><span class="cx">
</span><span class="cx"> $prefix = $wpdb->get_blog_prefix( $blog_id );
</span><span class="cx"> foreach ( $wpdb->tables( 'blog', false ) as $table ) {
</span><del>- $wpdb->suppress_errors();
</del><ins>+ $suppress = $wpdb->suppress_errors();
</ins><span class="cx"> $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
</span><del>- $wpdb->suppress_errors( false );
</del><ins>+ $wpdb->suppress_errors( $suppress );
</ins><span class="cx"> if ( $drop_tables )
</span><span class="cx"> $this->assertEmpty( $table_fields );
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionblogOptionphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/option/blogOption.php (26251 => 26252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/option/blogOption.php 2013-11-18 20:18:57 UTC (rev 26251)
+++ trunk/tests/phpunit/tests/option/blogOption.php 2013-11-18 20:44:34 UTC (rev 26252)
</span><span class="lines">@@ -5,12 +5,22 @@
</span><span class="cx"> * @group option
</span><span class="cx"> */
</span><span class="cx"> class Tests_Option_BlogOption extends WP_UnitTestCase {
</span><ins>+ protected $suppress = false;
+
</ins><span class="cx"> function setUp() {
</span><ins>+ global $wpdb;
</ins><span class="cx"> parent::setUp();
</span><ins>+ $this->suppress = $wpdb->suppress_errors();
</ins><span class="cx">
</span><span class="cx"> $_SERVER['REMOTE_ADDR'] = null;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function tearDown() {
+ global $wpdb;
+ parent::tearDown();
+ $wpdb->suppress_errors( $this->suppress );
+ }
+
</ins><span class="cx"> function test_from_same_site() {
</span><span class="cx"> $key = rand_str();
</span><span class="cx"> $key2 = rand_str();
</span></span></pre>
</div>
</div>
</body>
</html>