From 848c7035706c9a7a5b390748b9ba3a5dbb0ffaaa Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 6 Nov 2025 15:10:09 +0000 Subject: [PATCH 1/2] Initial plan From 60642592849f9e63c6736d6da245c36b32e216c4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 6 Nov 2025 15:21:01 +0000 Subject: [PATCH 2/2] Fix test flakiness by waiting for PluginRegistry sync after target load Co-authored-by: laeubi <1331477+laeubi@users.noreply.github.com> --- .../src/org/eclipse/pde/ui/tests/util/TargetPlatformUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/TargetPlatformUtil.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/TargetPlatformUtil.java index dba6174900a..cff3dc11a58 100644 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/TargetPlatformUtil.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/util/TargetPlatformUtil.java @@ -111,6 +111,10 @@ public static void loadAndSetTarget(ITargetDefinition target) throws Interrupted if (!result.isOK()) { throw new AssertionError(result.getMessage(), result.getException()); } + + // Wait for any follow-up jobs (e.g., PluginRegistry updates) to complete + // This ensures that the PluginRegistry is fully synchronized with the new target + TestUtils.waitForJobs("loadAndSetTarget", 100, 10000); } private static List addRunningPlatformBundles(Collection bundleContainers,