Skip to content

Fix flaky ensureCleanUpAddonCleansUp test #3786

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

Open
vogella wants to merge 2 commits into
base: master
Choose a base branch
from
+13 −7
Open

Fix flaky ensureCleanUpAddonCleansUp test #3786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b561fc
Revert "Fix race condition in CleanupAddon.subscribeRenderingChanged"
trancexpress Mar 17, 2026
dd7da4b
Fix flaky ensureCleanUpAddonCleansUp test
vogella Mar 17, 2026
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
17 changes: 10 additions & 7 deletions ...orkbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,13 +346,16 @@ private void subscribeRenderingChanged(
int visCount = modelService.countRenderableChildren(container);

// Remove stacks with no visible children from the display (but not the
// model). Since event delivery is synchronous (EventBroker.send via
// EventAdmin.sendEvent and Display.syncExec), the visCount reflects
// the actual state at the time of this event and can be acted upon
// immediately without deferring via asyncExec.
if (visCount == 0 && !isLastEditorStack(container)) {
container.setToBeRendered(false);
transferPrimaryDataStackIfRemoved(container);
// model)
final MElementContainer<MUIElement> theContainer = container;
if (visCount == 0) {
Display.getCurrent().asyncExec(() -> {
int visCount1 = modelService.countRenderableChildren(theContainer);
if (!isLastEditorStack(theContainer) && visCount1 == 0) {
theContainer.setToBeRendered(false);
transferPrimaryDataStackIfRemoved(theContainer);
}
});
} else if (container.getParent() != null) { // omit detached windows
// if there are rendered elements but none are 'visible' we should
// make the container invisible as well
Expand Down
3 changes: 3 additions & 0 deletions ...g.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2445,6 +2445,9 @@ public void ensureCleanUpAddonCleansUp() {

assertTrue(partStackForPartBPartC.isToBeRendered(), " PartStack with children should be rendered");
partService.hidePart(partB);
// Drain pending events between hides so that the event queue is clean
// when the second hidePart queues CleanupAddon's asyncExec for visCount==0
contextRule.spinEventLoop();
partService.hidePart(partC);
contextRule.spinEventLoop();
assertFalse(partStackForPartBPartC.isToBeRendered(),
Expand Down
Loading