Changeset 26252 for trunk/tests/phpunit/tests/option/blogOption.php

Timestamp:

11/18/2013 08:44:34 PM (11 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/option/blogOption.php (modified) (1 diff)

trunk/tests/phpunit/tests/option/blogOption.php

@@ -6 +6 @@
  */
 class Tests_Option_BlogOption extends WP_UnitTestCase {
+    protected $suppress = false; 
+
     function setUp() {
+        global $wpdb;
         parent::setUp();
+        $this->suppress = $wpdb->suppress_errors();
 
         $_SERVER['REMOTE_ADDR'] = null;
+    }
+
+    function tearDown() {
+        global $wpdb;
+        parent::tearDown();
+        $wpdb->suppress_errors( $this->suppress );
     }