Changeset 26252 for trunk/tests/phpunit/tests/ms.php

Timestamp:

11/18/2013 08:44:34 PM (13 years ago)

Author:

wonderboymusic

Message:

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 #26102.

File:

• trunk/tests/phpunit/tests/ms.php (modified) (3 diffs)

trunk/tests/phpunit/tests/ms.php

@@ -10 +10 @@
 class Tests_MS extends WP_UnitTestCase {
         protected $plugin_hook_count = 0;
+        protected $suppress = false;
 
         function setUp() {
+                global $wpdb;
                 parent::setUp();
+                $this->suppress = $wpdb->suppress_errors();
 
                 $_SERVER['REMOTE_ADDR'] = '';
+        }
+
+        function tearDown() {
+                global $wpdb;
+                parent::tearDown();
+                $wpdb->suppress_errors( $this->suppress );
         }
 
@@ -106 +115 @@
 
                         foreach ( $wpdb->tables( 'blog', false ) as $table ) {
-                                $wpdb->suppress_errors();
+                                $suppress = $wpdb->suppress_errors();
                                 $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
-                                $wpdb->suppress_errors( false );
+                                $wpdb->suppress_errors( $suppress );
                                 $this->assertNotEmpty( $table_fields );
                                 $result = $wpdb->get_results( "SELECT * FROM $prefix$table LIMIT 1" );
@@ -140 +149 @@
                         $prefix = $wpdb->get_blog_prefix( $blog_id );
                         foreach ( $wpdb->tables( 'blog', false ) as $table ) {
-                                $wpdb->suppress_errors();
+                                $suppress = $wpdb->suppress_errors();
                                 $table_fields = $wpdb->get_results( "DESCRIBE $prefix$table;" );
-                                $wpdb->suppress_errors( false );
+                                $wpdb->suppress_errors( $suppress );
                                 if ( $drop_tables )
                                         $this->assertEmpty( $table_fields );