diff options
| author | Lukas Felber | 2014-03-28 16:12:29 +0000 |
|---|---|---|
| committer | Sergey Prigogin | 2014-04-01 17:32:09 +0000 |
| commit | 8c3ba9ec2d651d0f1faa0dfd2266365030e34918 (patch) | |
| tree | ed53dd6271df854d1941315b220eb855bf0aacbb /core/org.eclipse.cdt.core.tests/suite | |
| parent | f65493131c5b846e3ba18ece3ef9886adeff988a (diff) | |
| download | org.eclipse.cdt-8c3ba9ec2d651d0f1faa0dfd2266365030e34918.tar.gz org.eclipse.cdt-8c3ba9ec2d651d0f1faa0dfd2266365030e34918.tar.xz org.eclipse.cdt-8c3ba9ec2d651d0f1faa0dfd2266365030e34918.zip | |
Bug 431684 - Intermittent test failures in IndexBugsTest
Improved reliability of BaseTestCase.waitForIndexer method.
Change-Id: Ifcfb4e90a1595e6cc2bc90856daad6cd265b6247
Signed-off-by: Lukas Felber <l.felber@gmx.ch>
Reviewed-on: https://git.eclipse.org/r/24080
Tested-by: Hudson CI
Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
IP-Clean: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Tested-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Diffstat (limited to 'core/org.eclipse.cdt.core.tests/suite')
| -rw-r--r-- | core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/BaseTestCase.java | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/BaseTestCase.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/BaseTestCase.java index 3ff3846e9e5..ca52e0e744b 100644 --- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/BaseTestCase.java +++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/BaseTestCase.java @@ -38,7 +38,6 @@ import org.eclipse.cdt.core.testplugin.TestScannerProvider; import org.eclipse.cdt.internal.core.CCoreInternals; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTNameBase; import org.eclipse.cdt.internal.core.pdom.CModelListener; -import org.eclipse.cdt.internal.core.pdom.PDOMManager; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResourceStatus; import org.eclipse.core.resources.ResourcesPlugin; @@ -305,16 +304,7 @@ public class BaseTestCase extends TestCase { public static void waitForIndexer(ICProject project) throws InterruptedException { Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_REFRESH, null); - - final PDOMManager indexManager = CCoreInternals.getPDOMManager(); - assertTrue(indexManager.joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm())); - long waitms= 1; - while (waitms < 2000 && !indexManager.isProjectRegistered(project)) { - Thread.sleep(waitms); - waitms *= 2; - } - assertTrue(indexManager.isProjectRegistered(project)); - assertTrue(indexManager.joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm())); + assertTrue(CCoreInternals.getPDOMManager().joinIndexer(INDEXER_TIMEOUT_SEC * 1000, npm())); } public static void waitUntilFileIsIndexed(IIndex index, IFile file) throws Exception { |