Skip to content

[7.67.x-blue] flaky test fixed #1448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baldimir merged 2 commits into from
Jun 19, 2025
Merged

[7.67.x-blue] flaky test fixed #1448

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28369b5
flaky test
yesamer Jun 13, 2025
7c75344
flaky test
yesamer Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions ...berfire-nio2-fs/src/main/java/org/uberfire/java/nio/fs/file/SimpleFileSystemProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand All @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion ...ire-nio2-fs/src/test/java/org/uberfire/java/nio/fs/file/SimpleFileSystemProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down