Changeset 9980 for trunk/tests/phpunit/testcases/blogs/class-bp-blogs-blog.php

Timestamp:

06/29/2015 09:42:43 PM (11 years ago)

Author:

boonebgorges

Message:

More targeted cleanup for unit tests that use bp_blogs_record_existing_blogs().

bp_blogs_record_existing_blogs() uses TRUNCATE, which closes the MySQL
transaction started by the WP automated test suite. As a result, fixtures
created before the TRUNCATE are not properly rolled back during tearDown().
Previously, the workaround for the problem had been heavy-handed: the wholesale
deletion of certain content during every test setup/teardown. The new technique
is to detect when a known autocommit has taken place - as it does in
bp_blogs_record_existing_blogs() - and to do a more targeted cleanup only in
these cases.

This allows us to dispense with various instances of blog fixture cleanup in
existing tests.

Fixes #6540.

File:

• trunk/tests/phpunit/testcases/blogs/class-bp-blogs-blog.php (modified) (5 diffs)

trunk/tests/phpunit/testcases/blogs/class-bp-blogs-blog.php

@@ -28 +28 @@
 
                 $this->assertEquals( array( $b ), $blog_ids );
-
-                $this->set_current_user( $old_user );
-                wpmu_delete_blog( $b, true );
         }
 
@@ -61 +58 @@
                 $this->assertEquals( array( $b ), $blog_ids );
                 $this->assertEquals( 1, $blogs['total'] );
-
-                $this->set_current_user( $old_user );
-                wpmu_delete_blog( $b, true );
         }
 
@@ -89 +83 @@
 
                 $this->assertEquals( array( $b ), $blog_ids );
-
-                $this->set_current_user( $old_user );
-                wpmu_delete_blog( $b, true );
         }
 
@@ -120 +111 @@
 
                 $this->assertEquals( array( $b ), $blog_ids );
-
-                $this->set_current_user( $old_user );
-                wpmu_delete_blog( $b, true );
         }
 
@@ -182 +170 @@
 
                 $this->set_current_user( $old_user );
-
-                foreach ( $bs as $d ) {
-                        wpmu_delete_blog( $d, true );
-                }
         }
 }