Changeset 51869 for trunk/tests/phpunit/tests/user/multisite.php

Timestamp:

09/25/2021 01:27:47 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Remove unnecessary setUp() and tearDown() methods in multisite tests.

These were originally added in [26252] to suppress database errors on setUp() and restore on tearDown() for tests that call wpmu_create_blog(), blog factory, or installation code that attempts to clear transients.

As the multisite test coverage expanded, these methods ended up being unnecessarily copied into other test classes, where database error suppression is not required.

Follow-up to [26252], [29916], [30286], [33184], [34898], [34899], [34901], [37234], [37477], [37894], [49212], [49616], [51859].

See #53363.

File:

• trunk/tests/phpunit/tests/user/multisite.php (modified) (2 diffs)

trunk/tests/phpunit/tests/user/multisite.php

@@ -11 +11 @@
      */
     class Tests_Multisite_User extends WP_UnitTestCase {
-        protected $suppress = false;
-
-        function set_up() {
-            global $wpdb;
-            parent::set_up();
-            $this->suppress = $wpdb->suppress_errors();
-        }
-
-        function tear_down() {
-            global $wpdb;
-            $wpdb->suppress_errors( $this->suppress );
-            parent::tear_down();
-        }
 
         function test_remove_user_from_blog() {
@@ -396 +383 @@
          */
         public function test_add_user_to_blog_invalid_user() {
+            global $wpdb;
+
             $site_id = self::factory()->blog->create();
 
-            $result = add_user_to_blog( 73622, $site_id, 'subscriber' );
+            $suppress = $wpdb->suppress_errors();
+            $result   = add_user_to_blog( 73622, $site_id, 'subscriber' );
+            $wpdb->suppress_errors( $suppress );
 
             wp_delete_site( $site_id );