Skip to content

Fix flaky PluginBasedLaunchTest by waiting for jobs and UI #2205

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
vogella merged 1 commit into from
Jan 23, 2026
Merged

Fix flaky PluginBasedLaunchTest by waiting for jobs and UI #2205

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
33 changes: 33 additions & 0 deletions ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/launcher/AbstractLaunchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

import org.assertj.core.api.Assertions;
import org.assertj.core.presentation.StandardRepresentation;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.resources.IProject;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
Expand All @@ -42,6 +43,7 @@
import org.eclipse.pde.core.plugin.PluginRegistry;
import org.eclipse.pde.ui.tests.util.ProjectUtils;
import org.eclipse.pde.ui.tests.util.TargetPlatformUtil;
import org.eclipse.swt.widgets.Display;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
Expand Down Expand Up @@ -82,6 +84,8 @@ public static IPluginModelBase findTargetModel(String id, String version) {
private static IPluginModelBase getModel(String id, String versionStr,
Function<ModelEntry, IPluginModelBase[]> modelsGetter, String type) {

waitForJobsAndUI(10000);

ModelEntry entry = PluginRegistry.findEntry(id);
assertNotNull("entry '" + id + "' should be present in PluginRegistry", entry);
IPluginModelBase[] models = modelsGetter.apply(entry);
Expand All @@ -98,6 +102,35 @@ private static IPluginModelBase getModel(String id, String versionStr,
() -> new NoSuchElementException("No " + type + " model " + id + "-" + version + " found"));
}

private static void waitForJobsAndUI(long timeoutMillis) {
long start = System.currentTimeMillis();

while (System.currentTimeMillis() - start < timeoutMillis) {
// Process UI events
while (Display.getDefault().readAndDispatch()) {
// Keep processing
}

// Check if all jobs are done
if (Job.getJobManager().isIdle()) {
// Process any final UI events
while (Display.getDefault().readAndDispatch()) {
// Keep processing
}
return;
}

try {
Thread.sleep(50);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
return;
}
}

// throw new AssertionError("Timeout waiting for jobs to complete");
}

static BundleLocationDescriptor workspaceBundle(String id, String version) {
Objects.requireNonNull(version);
return () -> findWorkspaceModel(id, version);
Expand Down
Loading