Changeset 52389 for trunk/tests/phpunit/tests/admin/includesPlugin.php

Timestamp:

12/19/2021 01:42:37 PM (3 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Reduce the use of unnecessary randomness in tests.

This increases the overall reliability of the tests.

Props johnillo

Fixes #37371

File:

• trunk/tests/phpunit/tests/admin/includesPlugin.php (modified) (6 diffs)

trunk/tests/phpunit/tests/admin/includesPlugin.php

@@ -488 +488 @@
 
         $dropins = get_dropins();
-        $this->assertSame( array( 'advanced-cache.php' ), array_keys( $dropins ) );
 
         unlink( $p1[1] );
         unlink( $p2[1] );
 
+        $this->assertSame( array( 'advanced-cache.php' ), array_keys( $dropins ) );
+
         // Clean up.
         $this->_restore_drop_ins();
@@ -510 +511 @@
         $p = $this->_create_plugin( "<?php\n/*\nPlugin Name: test\nNetwork: true" );
 
-        $this->assertTrue( is_network_only_plugin( $p[0] ) );
+        $network_only = is_network_only_plugin( $p[0] );
 
         unlink( $p[1] );
+
+        $this->assertTrue( $network_only );
     }
 
@@ -572 +575 @@
         update_option( 'uninstall_plugins', $uninstallable_plugins );
 
-        $this->assertTrue( is_uninstallable_plugin( $plugin[0] ) );
+        $is_uninstallable = is_uninstallable_plugin( $plugin[0] );
 
         unset( $uninstallable_plugins[ $plugin[0] ] );
@@ -578 +581 @@
 
         unlink( $plugin[1] );
+
+        $this->assertTrue( $is_uninstallable );
     }
 
@@ -596 +601 @@
     private function _create_plugin( $data = "<?php\n/*\nPlugin Name: Test\n*/", $filename = false, $dir_path = false ) {
         if ( false === $filename ) {
-            $filename = rand_str() . '.php';
+            $filename = __FUNCTION__ . '.php';
         }
 
@@ -603 +608 @@
         }
 
-        $full_name = $dir_path . '/' . wp_unique_filename( $dir_path, $filename );
+        $filename  = wp_unique_filename( $dir_path, $filename );
+        $full_name = $dir_path . '/' . $filename;
 
         $file = fopen( $full_name, 'w' );