Changeset 26252 for trunk/tests/phpunit/includes/factory.php

Timestamp:

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

trunk/tests/phpunit/includes/factory.php

@@ -160 +160 @@
 
     function create_object( $args ) {
+        global $wpdb;
         $meta = isset( $args['meta'] ) ? $args['meta'] : array();
         $user_id = isset( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
-        return wpmu_create_blog( $args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id'] );
+        // 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;
     }