Ignore directory removal failures on CI windows

Author: adamziel

components/HttpClient/Tests/CacheMiddlewareIntegrationTest.php

@@ -27,7 +27,15 @@ protected function tearDown(): void {
 	}
 
 	private function removeDirectory( string $dir ): void {
-		LocalFilesystem::create($dir)->rmdir('/', ['recursive' => true]);
+		try {
+			LocalFilesystem::create($dir)->rmdir('/', ['recursive' => true]);
+		} catch ( \Exception $e ) {
+			// Ignore errors on windows – CI sometimes fails to remove the topmost directory
+			if(PHP_OS_FAMILY === 'Windows') {
+				return;
+			}
+			throw $e;
+		}
 	}
 
 	private function makeRequest( string $url, string $method = 'GET', array $headers = [] ): array {

components/HttpClient/Tests/CacheMiddlewareTest.php

@@ -32,7 +32,15 @@ protected function setUp(): void {
 	}
 
 	protected function tearDown(): void {
-		LocalFilesystem::create($this->cache_dir)->rmdir('/', ['recursive' => true]);
+		try {
+			LocalFilesystem::create($this->cache_dir)->rmdir('/', ['recursive' => true]);
+		} catch ( \Exception $e ) {
+			// Ignore errors on windows – CI sometimes fails to remove the topmost directory
+			if(PHP_OS_FAMILY === 'Windows') {
+				return;
+			}
+			throw $e;
+		}
 	}
 
 	public function test_cache_miss_forwards_to_next_middleware(): void {