yet another attempt to fix blinking test

This commit is contained in:
Dmitry Batrak
2015-12-10 14:26:52 +03:00
parent 3746d7fdaf
commit 1bf78b5b83
3 changed files with 31 additions and 17 deletions
@@ -2121,15 +2121,18 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
private void waitForDaemon() {
long deadline = System.currentTimeMillis() + 60_000;
while (PsiDocumentManager.getInstance(myProject).isUncommited(myEditor.getDocument())) {
if (System.currentTimeMillis() > deadline) fail("Too long waiting for document commit");
UIUtil.dispatchAllInvocationEvents();
while (!daemonIsWorkingOrPending()) {
if (System.currentTimeMillis() > deadline) fail("Too long waiting for daemon to start");
UIUtil.dispatchInvocationEvent();
}
UIUtil.dispatchAllInvocationEvents(); // make sure daemon is started
while (myDaemonCodeAnalyzer.isRunning()) {
while (daemonIsWorkingOrPending()) {
if (System.currentTimeMillis() > deadline) fail("Too long waiting for daemon to finish");
UIUtil.dispatchAllInvocationEvents();
UIUtil.dispatchInvocationEvent();
}
}
private boolean daemonIsWorkingOrPending() {
return PsiDocumentManager.getInstance(myProject).isUncommited(myEditor.getDocument()) || myDaemonCodeAnalyzer.isRunningOrPending();
}
}