Bug 517071 - [tests] random fail inS4_7_0_RC4aS4_7_0_RC4S4_7_0_RC3S4_7_0_RC2R4_7I20170612-0950I20170608-0530I20170607-2000I20170607-1100I20170607-0800I20170607-0215I20170606-2000I20170606-0800I20170605-2000I20170605-0800I20170604-2000I20170604-0800I20170603-1500I20170603-0800I20170603-0100I20170602-2000I20170531-2000I20170531-0800I20170530-2000I20170530-0800I20170529-2000I20170529-0800I20170528-2000I20170528-0800I20170527-1500I20170527-0800I20170526-2000I20170524-2000I20170524-0800I20170523-2000I20170523-0800

JavaThreadEventHandlerTests.testComputeFrameIndexDuringEvaluation()

Slightly reduce evaluation wait time to give
JavaThreadEventHandler.waitIfEvaluationRuns() a chance to see evaluation
end before timeout. Also retry the test if it should fail.

Change-Id: Ia5815bdff447da56d7896e6ff34150ad5bd1b01c
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

1 files changed, 5 insertions, 1 deletions

diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/JavaThreadEventHandlerTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/JavaThreadEventHandlerTests.java
index 5ee4d322b..b941eada8 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/JavaThreadEventHandlerTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/breakpoints/JavaThreadEventHandlerTests.java
@@ -24,6 +24,7 @@ import org.eclipse.jdt.debug.core.IJavaThread;
 import org.eclipse.jdt.debug.eval.IEvaluationListener;
 import org.eclipse.jdt.debug.eval.IEvaluationResult;
 import org.eclipse.jdt.debug.tests.AbstractDebugTest;
+import org.eclipse.jdt.debug.tests.TestAgainException;
 import org.eclipse.jdt.internal.debug.eval.ast.engine.ASTEvaluationEngine;
 import org.eclipse.jdt.internal.debug.ui.threadgroups.JavaDebugTargetProxy;
 import org.eclipse.jdt.internal.debug.ui.threadgroups.JavaThreadEventHandler;
@@ -139,7 +140,7 @@ public class JavaThreadEventHandlerTests extends AbstractDebugTest {
 			assertNotNull("suspended, but not by breakpoint", hit);
 			assertTrue("breakpoint was not a method breakpoint", hit instanceof IJavaMethodBreakpoint);
 
-			final int sleepTimeMillis = 1000;
+			final int sleepTimeMillis = 750;
 			String snippet = "java.lang.Thread.sleep(" + sleepTimeMillis + "); return true;";
 			TaskOnFrame task = new TaskOnFrame() {
 				@Override
@@ -154,6 +155,9 @@ public class JavaThreadEventHandlerTests extends AbstractDebugTest {
 					// indexOf method waits for evaluation and computes the right result
 					for (int i = 0; i < expectedFramesCount; i++) {
 						int index = eventHandler.indexOf(frames[i]);
+						if (index == -1) {
+							throw new TestAgainException("Evaluation took too long");
+						}
 						assertEquals(i, index);
 					}
 					Thread.sleep(sleepTimeMillis);