From 85162ebd30fa2527ed6f6e5188554be87d633045 Mon Sep 17 00:00:00 2001 From: John Cortell Date: Tue, 25 May 2010 22:45:29 +0000 Subject: [PATCH] Don't use the junit timeout feature. It's too rigid and is a pain when troubleshooting issues. --- .../eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java index aa4ef96690f..bb2a7a77711 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIExpressionsTest.java @@ -2317,7 +2317,6 @@ public class MIExpressionsTest extends BaseTestCase { * to make sure that the parent is re-created once and only once. * We had a bug where we would enter an infinite loop in this case. */ - @Test(timeout=5000) public void testConcurrentUpdateOutOfScopeChildThenParent() throws Throwable { SyncUtil.runToLocation("testConcurrentUpdateOutOfScopeChildThenParent"); MIStoppedEvent stoppedEvent = SyncUtil.step(2, StepType.STEP_INTO); @@ -2368,7 +2367,7 @@ public class MIExpressionsTest extends BaseTestCase { } }); - wait.waitUntilDone(AsyncCompletionWaitor.WAIT_FOREVER); + wait.waitUntilDone(TestsPlugin.massageTimeout(5000)); assertTrue(wait.getMessage(), wait.isOK()); wait.waitReset(); @@ -2400,7 +2399,7 @@ public class MIExpressionsTest extends BaseTestCase { } }); - wait.waitUntilDone(AsyncCompletionWaitor.WAIT_FOREVER); + wait.waitUntilDone(TestsPlugin.massageTimeout(5000)); assertTrue(wait.getMessage(), wait.isOK()); wait.waitReset(); @@ -2448,7 +2447,7 @@ public class MIExpressionsTest extends BaseTestCase { } }); - wait.waitUntilDone(AsyncCompletionWaitor.WAIT_FOREVER); + wait.waitUntilDone(TestsPlugin.massageTimeout(5000)); assertTrue(wait.getMessage(), wait.isOK()); wait.waitReset();