From ef195dbb734578212be5a9427e9911ba9b877b92 Mon Sep 17 00:00:00 2001 From: Christian Walther Date: Thu, 18 Aug 2022 17:32:31 +0200 Subject: [PATCH] Fix flaky tests in BuiltinSpecsDetectorTest testAbstractBuiltinSpecsDetector_EnvChangesGlobal did not properly clean up after itself, which caused testAbstractBuiltinSpecsDetector_EnvChangesConfiguration_1, testAbstractBuiltinSpecsDetector_EnvChangesConfiguration_2, and testAbstractBuiltinSpecsDetector_EnvChangesGlobal to fail when run for the second time in the same session. Running tests twice is not useful, but happens in Eclipse with a launch configuration set to run all tests in org.eclipse.cdt.managedbuilder.core.tests/tests - once directly and once through AllLanguageSettingsProvidersMBSTestSuite. I have not found any way of running every test exactly once in the GUI. --- .../settings/providers/tests/BuiltinSpecsDetectorTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java index 7e643eb814b..c59788f7cf0 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java @@ -851,6 +851,10 @@ public class BuiltinSpecsDetectorTest extends BaseTestCase { assertEquals(true, provider.isExecuted()); assertEquals(ENV_SAMPLE_VALUE_2, provider.getSampleEnvVar()); + // clean up + vars.deleteAll(); + fUserSupplier.setWorkspaceEnvironment(vars); + // unregister listeners provider.unregisterListener(); }