mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-05 23:35:48 +02:00
Code Issues Wiki Activity

Fix flaky test testPersistentProperties

Browse source 
Don't sleep for a hardcoded time but wait for the actual condition.
1000 ms was often insufficient on my system.
This commit is contained in:
Christian Walther 2022-08-18 16:39:44 +02:00 • committed by Jonah Graham
parent ccdd9b2c99
commit 5f3cd7ac20
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/CProjectDescriptionSerializationTests.java
View file

@ -202,7 +202,6 @@ public class CProjectDescriptionSerializationTests extends TestCase {
coreModel.setProjectDescription(project, des); coreModel.setProjectDescription(project, des);
Assert.assertEquals(project, des.getProject()); Assert.assertEquals(project, des.getProject());
Thread.sleep(1000); // let scanner discovery participate
try { try {
QualifiedName pdomName = new QualifiedName(CCorePlugin.PLUGIN_ID, "pdomName"); QualifiedName pdomName = new QualifiedName(CCorePlugin.PLUGIN_ID, "pdomName");
QualifiedName activeCfg = new QualifiedName(CCorePlugin.PLUGIN_ID, "activeConfiguration"); QualifiedName activeCfg = new QualifiedName(CCorePlugin.PLUGIN_ID, "activeConfiguration");
@ -210,6 +209,13 @@ public class CProjectDescriptionSerializationTests extends TestCase {
QualifiedName discoveredScannerConfigFileName = new QualifiedName(MakeCorePlugin.PLUGIN_ID, QualifiedName discoveredScannerConfigFileName = new QualifiedName(MakeCorePlugin.PLUGIN_ID,
"discoveredScannerConfigFileName"); "discoveredScannerConfigFileName");
// pdomName is set by indexer setup, which may still be postponed or not even
// scheduled yet, so we can't join the job. Just wait for the property to appear.
// (The other properties were set synchronously in setProjectDescription().)
for (int i = 0; i < 100 && !project.getPersistentProperties().containsKey(pdomName); i++) {
Thread.sleep(100);
}
assertTrue("pdomName", project.getPersistentProperties().containsKey(pdomName)); assertTrue("pdomName", project.getPersistentProperties().containsKey(pdomName));
assertTrue("activeCfg", project.getPersistentProperties().containsKey(activeCfg)); assertTrue("activeCfg", project.getPersistentProperties().containsKey(activeCfg));
assertTrue("discoveredScannerConfigFileName", assertTrue("discoveredScannerConfigFileName",