From 390a8d22b58c254099aae6d5051b285b1168dc0f Mon Sep 17 00:00:00 2001 From: Christian Walther Date: Thu, 19 Aug 2021 09:50:51 +0200 Subject: [PATCH] Bug 575508: Fix flaky test Bug_303953Test.testBuildAfterSourcefileDelete() is occasionally seen failing with an unexpected change to .cproject. I have not investigated what the change is, but it's plausible that some background process like the indexer or scanner discovery might asynchronously modify .cproject, and .cproject is not the focus of this test, so just ignore it along with .project. On the hopeful assumption that this was the only flakiness, I am removing the @Tag(BaseTestCase5.FLAKY_TEST_TAG) annotation. Change-Id: Ie9191aaf1a66e8475f05eb422d6e4b3949f8138d Signed-off-by: Christian Walther --- .../cdt/managedbuilder/core/regressions/Bug_303953Test.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953Test.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953Test.java index 389ede01354..3d705a4d106 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953Test.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_303953Test.java @@ -20,7 +20,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.eclipse.cdt.core.testplugin.util.BaseTestCase5; import org.eclipse.cdt.managedbuilder.testplugin.AbstractBuilderTest; import org.eclipse.cdt.managedbuilder.testplugin.ResourceDeltaVerifier; import org.eclipse.core.resources.IFile; @@ -29,7 +28,6 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.CoreException; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; /** @@ -39,7 +37,6 @@ import org.junit.jupiter.api.Test; */ public class Bug_303953Test extends AbstractBuilderTest { - @Tag(BaseTestCase5.FLAKY_TEST_TAG) @Test public void testBuildAfterSourcefileDelete() throws CoreException { setWorkspace("regressions"); @@ -54,7 +51,8 @@ public class Bug_303953Test extends AbstractBuilderTest { ResourceDeltaVerifier verifier = new ResourceDeltaVerifier(); verifier.addExpectedChange(buildOutputResources.toArray(new IResource[buildOutputResources.size()]), IResourceDelta.ADDED, IResourceDelta.NO_CHANGE); - verifier.addIgnore(new IResource[] { getWorkspace().getRoot(), app, app.getFile(".project") }); + verifier.addIgnore( + new IResource[] { getWorkspace().getRoot(), app, app.getFile(".project"), app.getFile(".cproject") }); verifyBuild(app, IncrementalProjectBuilder.FULL_BUILD, verifier); // Delete helloworldC