Ticket #28692: 28692.2.diff

tests/phpunit/includes/testcase.php

@@ -35 +35 @@
                 global $wpdb, $wp_query, $post;
                 $this->expectedDeprecated();
                 $wpdb->query( 'ROLLBACK' );
+                if ( is_multisite() ) {
+                        while ( ms_is_switched() ) {
+                                restore_current_blog();
+                        }
+                }
                 $wp_query = new WP_Query();
                 $post = null;
                 remove_theme_support( 'html5' );

tests/phpunit/tests/ms.php

@@ -1512 +1512 @@
         function _setup_host_request( $domain, $path ) {
                 global $current_site, $current_blog, $wpdb, $table_prefix;
 
+                $table_prefix = 'wptests_';
                 $current_site = $current_blog = null;
                 $_SERVER['HTTP_HOST'] = $domain;
                 $_SERVER['REQUEST_URI'] = $path;