Skip to content

[Linux] Fix random test failures of browser tests #1523 #1788

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
merged 1 commit into from
Feb 3, 2025
Merged

[Linux] Fix random test failures of browser tests #1523 #1788

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 21 additions & 6 deletions ...t.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2847,12 +2847,11 @@ private static Set<Entry<String, String>> getPropertiesSafe() {
private static List<String> getOpenedDescriptors() {
List<String> paths = new ArrayList<>();
Path fd = Paths.get("/proc/self/fd/");
try(DirectoryStream<Path> directoryStream = Files.newDirectoryStream(fd)){
directoryStream.forEach(f -> {
try {
paths.add(Files.isSymbolicLink(f)? Files.readSymbolicLink(f).toString() : f.toString());
} catch (IOException e) {
e.printStackTrace();
try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(fd)) {
directoryStream.forEach(path -> {
String resolvedPath = resolveSymLink(path);
if (isTestRelatedFileDescriptor(resolvedPath)) {
paths.add(resolvedPath);
}
});
} catch (IOException e1) {
Expand All @@ -2865,6 +2864,22 @@ private static List<String> getOpenedDescriptors() {
return paths;
}

private static boolean isTestRelatedFileDescriptor(String fileDescriptorPath) {
// Do not consider file descriptors of Maven artifacts that are currently opened
// by other Maven plugins executed in parallel build (such as parallel
// compilation of the swt.tools bundle etc.)
return fileDescriptorPath != null && !fileDescriptorPath.contains(".m2")
&& !fileDescriptorPath.contains("target/classes");
}

private static String resolveSymLink(Path path) {
try {
return Files.isSymbolicLink(path) ? Files.readSymbolicLink(path).toString() : path.toString();
} catch (IOException e) {
e.printStackTrace();
}
return null;
}

private static void processUiEvents() {
Display display = Display.getCurrent();
Expand Down
Loading