Changeset 61423

Timestamp:

01/02/2026 10:10:33 PM (3 months ago)

Author:

SergeyBiryukov

Message:

Tests: Reset environment before performing assertions in populate_network() tests.

This aims to avoid affecting other tests in case of failure.

Follow-up to [60954], [61420].

See #64225.

File:

• trunk/tests/phpunit/tests/multisite/populateNetworkHooks.php (modified) (4 diffs)

trunk/tests/phpunit/tests/multisite/populateNetworkHooks.php

@@ -57 +57 @@
             );
 
+            remove_action( 'before_populate_network', array( $this, 'hook_action_counter' ), 10 );
+            remove_action( 'after_populate_network', array( $this, 'hook_action_counter' ), 10 );
+
+            global $wpdb;
+            $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", $network_id ) );
+            $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site} WHERE id = %d", $network_id ) );
+
             $this->assertSame( 1, $this->action_counts['before_populate_network'], 'before_populate_network action should fire once' );
             $this->assertSame( 1, $this->action_counts['after_populate_network'], 'after_populate_network action should fire once' );
@@ -64 +71 @@
             $this->assertSame( $network_id, $this->action_args['after_populate_network']['network_id'], 'Network ID should match in after_populate_network hook' );
             $this->assertSame( $domain, $this->action_args['after_populate_network']['domain'], 'Domain should match in after_populate_network hook' );
-
-            remove_action( 'before_populate_network', array( $this, 'hook_action_counter' ), 10 );
-            remove_action( 'after_populate_network', array( $this, 'hook_action_counter' ), 10 );
-
-            global $wpdb;
-            $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", $network_id ) );
-            $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site} WHERE id = %d", $network_id ) );
         }
 
@@ -91 +91 @@
             );
 
-            $this->assertTrue( $this->hook_called, 'The modify_domain_hook action should have been called' );
-
             remove_action( 'before_populate_network', array( $this, 'modify_domain_hook' ), 10 );
 
@@ -98 +96 @@
             $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", $network_id ) );
             $wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site} WHERE id = %d", $network_id ) );
+
+            $this->assertTrue( $this->hook_called, 'The modify_domain_hook action should have been called' );
         }