From 28369b5fe32f6a939447eef2dec1b5a15679f599 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Fri, 13 Jun 2025 10:11:30 +0200 Subject: [PATCH 1/2] flaky test --- .../nio/fs/file/SimpleFileSystemProvider.java | 22 ++++++++++++------- .../fs/file/SimpleFileSystemProviderTest.java | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-fs/src/main/java/org/uberfire/java/nio/fs/file/SimpleFileSystemProvider.java b/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-fs/src/main/java/org/uberfire/java/nio/fs/file/SimpleFileSystemProvider.java index 20059899f9..856eb9c0d0 100644 --- a/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-fs/src/main/java/org/uberfire/java/nio/fs/file/SimpleFileSystemProvider.java +++ b/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-fs/src/main/java/org/uberfire/java/nio/fs/file/SimpleFileSystemProvider.java @@ -33,6 +33,8 @@ import java.util.concurrent.ExecutorService; import org.apache.commons.io.FileUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.uberfire.java.nio.IOException; import org.uberfire.java.nio.base.BasicFileAttributesImpl; import org.uberfire.java.nio.base.ExtendedAttributeView; @@ -73,8 +75,10 @@ public class SimpleFileSystemProvider implements FileSystemProvider { + private static final Logger LOGGER = LoggerFactory.getLogger(SimpleFileSystemProvider.class); private static final String STREAM_CLOSED = "This stream is closed."; private static final String USER_DIR = "user.dir"; + protected BaseSimpleFileSystem fileSystem; private final OSType osType; private final File[] roots; @@ -419,7 +423,7 @@ public void delete(final Path path, @Override public boolean deleteIfExists(final Path path, final DeleteOption... options) - throws DirectoryNotEmptyException, IOException, SecurityException { + throws IOException, SecurityException { checkNotNull("path", path); synchronized (this) { @@ -430,16 +434,18 @@ public boolean deleteIfExists(final Path path, throw new DirectoryNotEmptyException(path.toString()); } - final boolean result = file.exists(); + boolean fileRemoved = file.exists(); - try { - FileUtils.forceDelete(file); - } catch (final FileNotFoundException ignore) { - } catch (java.io.IOException e) { - throw new IOException(e); + if (file.exists()) { + try { + FileUtils.forceDelete(file); + } catch (java.io.IOException e) { + fileRemoved = false; + LOGGER.error("Error trying to delete file {}", file.getAbsolutePath(), e); + } } - return result; + return fileRemoved; } finally { toGeneralPathImpl(path).clearCache(); } diff --git a/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-fs/src/test/java/org/uberfire/java/nio/fs/file/SimpleFileSystemProviderTest.java b/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-fs/src/test/java/org/uberfire/java/nio/fs/file/SimpleFileSystemProviderTest.java index 629f3384be..6b00f919ce 100644 --- a/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-fs/src/test/java/org/uberfire/java/nio/fs/file/SimpleFileSystemProviderTest.java +++ b/uberfire-nio2-backport/uberfire-nio2-impls/uberfire-nio2-fs/src/test/java/org/uberfire/java/nio/fs/file/SimpleFileSystemProviderTest.java @@ -594,7 +594,7 @@ public void checkDeleteIfExists() throws IOException { assertThat(path.toFile()).doesNotExist(); } - @Test(expected = org.uberfire.java.nio.IOException.class) + @Test public void checkDeleteIfExistsNonExistent() { final SimpleFileSystemProvider fsProvider = new SimpleFileSystemProvider(); From 7c75344717adbe3ca6d8a95fc7788f911075a1d7 Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Fri, 13 Jun 2025 12:11:47 +0200 Subject: [PATCH 2/2] flaky test --- .../backend/infinispan/provider/InfinispanPingServiceTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/uberfire-extensions/uberfire-metadata/uberfire-metadata-backends/uberfire-metadata-backend-infinispan/src/test/java/org/uberfire/ext/metadata/backend/infinispan/provider/InfinispanPingServiceTest.java b/uberfire-extensions/uberfire-metadata/uberfire-metadata-backends/uberfire-metadata-backend-infinispan/src/test/java/org/uberfire/ext/metadata/backend/infinispan/provider/InfinispanPingServiceTest.java index d59653ac1c..f3363af662 100644 --- a/uberfire-extensions/uberfire-metadata/uberfire-metadata-backends/uberfire-metadata-backend-infinispan/src/test/java/org/uberfire/ext/metadata/backend/infinispan/provider/InfinispanPingServiceTest.java +++ b/uberfire-extensions/uberfire-metadata/uberfire-metadata-backends/uberfire-metadata-backend-infinispan/src/test/java/org/uberfire/ext/metadata/backend/infinispan/provider/InfinispanPingServiceTest.java @@ -52,6 +52,7 @@ public void setUp() { public void testPingSuccess() { { InfinispanPingService service = spy(new InfinispanPingService(remoteCache)); + when(pingResponse.isSuccess()).thenReturn(true); assertTrue(service.ping()); service.stop(); }