Changeset 57849

Timestamp:

03/18/2024 09:25:33 AM (2 years ago)

Author:

swissspidy

Message:

Build/Test Tools: Make WP_Filesystem_Direct tests more robust.

Follow-up to [57753] to make tests more robust, as there were multiple permission-related errors in the hosting test results.
With this change, the tests now don’t try setting an owner that doesn’t exist.

Props peterwilsoncc, costdev, javiercasares.
See #57774.

File:

• trunk/tests/phpunit/tests/filesystem/wpFilesystemDirect/mkdir.php (modified) (4 diffs)

trunk/tests/phpunit/tests/filesystem/wpFilesystemDirect/mkdir.php

@@ -160 +160 @@
                 rmdir( $path );
 
-                $expected_group = $this->is_windows() ? $original_owner : $original_owner + 1;
-                $created        = self::$filesystem->mkdir( $path, 0755, $expected_group );
-                $owner          = fileowner( $path );
+                $created = self::$filesystem->mkdir( $path, 0755, $original_owner );
+                $owner   = fileowner( $path );
 
                 if ( $path !== self::$file_structure['test_dir']['path'] && is_dir( $path ) ) {
@@ -169 +168 @@
 
                 $this->assertTrue( $created, 'The directory was not created.' );
-                $this->assertSame( $expected_group, $owner, 'The owner is incorrect.' );
+                $this->assertSame( $original_owner, $owner, 'The owner is incorrect.' );
         }
 
@@ -198 +197 @@
                 rmdir( $path );
 
-                $expected_group = $this->is_windows() ? $original_group : $original_group + 1;
-                $created        = self::$filesystem->mkdir( $path, 0755, false, $expected_group );
-                $group          = filegroup( $path );
+                $created = self::$filesystem->mkdir( $path, 0755, false, $original_group );
+                $group   = filegroup( $path );
 
                 if ( $path !== self::$file_structure['test_dir']['path'] && is_dir( $path ) ) {
@@ -207 +205 @@
 
                 $this->assertTrue( $created, 'The directory was not created.' );
-                $this->assertSame( $expected_group, $group, 'The group is incorrect.' );
+                $this->assertSame( $original_group, $group, 'The group is incorrect.' );
         }
 }