Changeset 61212

Timestamp:

11/11/2025 01:31:30 PM (11 months ago)

Author:

SergeyBiryukov

Message:

Tests: Clean up file destination in _unzip_file_*() unit tests.

This ensures clean environment in case of a previous test failure.

Follow-up to [56689].

Props aslamdoctor, wildworks, peterwilsoncc, SirLouen, mindctrl, kalpeshh, yashjawale, sachinrajcp123, SergeyBiryukov.
Fixes #63443.

Location:

trunk/tests/phpunit/tests/filesystem

Files:

• unzipFilePclzip.php (modified) (2 diffs)
• unzipFileZiparchive.php (modified) (2 diffs)

trunk/tests/phpunit/tests/filesystem/unzipFilePclzip.php

@@ -42 +42 @@
                 // Prepare test environment.
                 $unzip_destination = self::$test_data_dir . 'archive/';
+                if ( file_exists( $unzip_destination ) ) {
+                        $this->rmdir( $unzip_destination );
+                        $this->delete_folders( $unzip_destination );
+                }
                 mkdir( $unzip_destination );
 
                 _unzip_file_pclzip( self::$test_data_dir . 'archive.zip', $unzip_destination );
 
-                // Cleanup test environment.
+                // Clean up test environment.
                 $this->rmdir( $unzip_destination );
                 $this->delete_folders( $unzip_destination );
@@ -64 +68 @@
                 // Prepare test environment.
                 $unzip_destination = self::$test_data_dir . 'archive/';
+                if ( file_exists( $unzip_destination ) ) {
+                        $this->rmdir( $unzip_destination );
+                        $this->delete_folders( $unzip_destination );
+                }
                 mkdir( $unzip_destination );
 
                 _unzip_file_pclzip( self::$test_data_dir . 'archive.zip', $unzip_destination );
 
-                // Cleanup test environment.
+                // Clean up test environment.
                 $this->rmdir( $unzip_destination );
                 $this->delete_folders( $unzip_destination );

trunk/tests/phpunit/tests/filesystem/unzipFileZiparchive.php

@@ -46 +46 @@
                 // Prepare test environment.
                 $unzip_destination = self::$test_data_dir . 'archive/';
+                if ( file_exists( $unzip_destination ) ) {
+                        $this->rmdir( $unzip_destination );
+                        $this->delete_folders( $unzip_destination );
+                }
                 mkdir( $unzip_destination );
 
                 _unzip_file_ziparchive( self::$test_data_dir . 'archive.zip', $unzip_destination );
 
-                // Cleanup test environment.
+                // Clean up test environment.
                 $this->rmdir( $unzip_destination );
                 $this->delete_folders( $unzip_destination );
@@ -72 +76 @@
                 // Prepare test environment.
                 $unzip_destination = self::$test_data_dir . 'archive/';
+                if ( file_exists( $unzip_destination ) ) {
+                        $this->rmdir( $unzip_destination );
+                        $this->delete_folders( $unzip_destination );
+                }
                 mkdir( $unzip_destination );
 
                 _unzip_file_ziparchive( self::$test_data_dir . 'archive.zip', $unzip_destination );
 
-                // Cleanup test environment.
+                // Clean up test environment.
                 $this->rmdir( $unzip_destination );
                 $this->delete_folders( $unzip_destination );