Changeset 9138

Timestamp:

11/13/2014 04:08:51 AM (12 years ago)

Author:

boonebgorges

Message:

Delete users more selectively between tests.

In [7043] a workaround was introduced for a bug in the multisite tests. The
bug is that the admin user was not properly cleared after each test; the
workaround was to truncate the users table during setUp(). But this makes it
impossible to share user fixtures between tests. So in this changeset we
institute a narrower workaround that only deletes the specific problematic
user.

File:

• trunk/tests/phpunit/includes/testcase.php (modified) (1 diff)

trunk/tests/phpunit/includes/testcase.php

@@ -17 +17 @@
                 parent::setUp();
 
-                // Make sure all users are deleted
                 // There's a bug in the multisite tests that causes the
                 // transaction rollback to fail for the first user created,
                 // which busts every other attempt to create users. This is a
-                // hack workaround
+                // hack workaround.
                 global $wpdb;
-                $wpdb->query( "TRUNCATE TABLE {$wpdb->users}" );
+                if ( is_multisite() ) {
+                        $user_1 = get_user_by( 'login', 'user 1' );
+                        if ( $user_1 ) {
+                                $wpdb->delete( $wpdb->users, array( 'ID' => $user_1->ID ) );
+                                clean_user_cache( $user_1 );
+                        }
+                }
 
                 // Fake WP mail globals, to avoid errors