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

Timestamp:

09/25/2021 01:27:47 AM (5 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/multisite/network.php (modified) (2 diffs)

trunk/tests/phpunit/tests/multisite/network.php

@@ -11 +11 @@
         class Tests_Multisite_Network extends WP_UnitTestCase {
                 protected $plugin_hook_count = 0;
-                protected $suppress          = false;
 
                 protected static $different_network_id;
                 protected static $different_site_ids = array();
 
-                function set_up() {
-                        global $wpdb;
-                        parent::set_up();
-                        $this->suppress = $wpdb->suppress_errors();
-                }
-
                 function tear_down() {
-                        global $wpdb, $current_site;
-                        $wpdb->suppress_errors( $this->suppress );
+                        global $current_site;
                         $current_site->id = 1;
                         parent::tear_down();
@@ -591 +583 @@
                  */
                 public function test_wpmu_create_blog_updates_correct_network_site_count() {
+                        global $wpdb;
+
                         $original_count = get_blog_count( self::$different_network_id );
 
-                        $site_id = wpmu_create_blog( 'example.org', '/', '', 1, array(), self::$different_network_id );
+                        $suppress = $wpdb->suppress_errors();
+                        $site_id  = wpmu_create_blog( 'example.org', '/', '', 1, array(), self::$different_network_id );
+                        $wpdb->suppress_errors( $suppress );
 
                         $result = get_blog_count( self::$different_network_id );