From: Marc-Andre Laperle Date: Sun, 10 Apr 2016 18:22:29 +0000 (-0400) Subject: Increase timeouts for tests that have low values X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=9e8daee1d271edbba8a7fd8b1018b88a524cb285;p=deliverable%2Ftracecompass.git Increase timeouts for tests that have low values Some tests have short timeouts (20 secs) that would usually not be a problem on an performant machine but when build servers are under load, especially in I/O, this can lead to intermittent failures. This changes increases those 20 secs timeouts to 1 minute to help in those situations. Change-Id: I38b56c65d3981c4cf6490724f97aa26de7b0f736 Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/70330 Reviewed-by: Hudson CI Reviewed-by: Alexandre Montplaisir Tested-by: Alexandre Montplaisir --- diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java index 6d5b93422b..5c552b688f 100644 --- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java +++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/temp/tracemanager/TmfTraceManagerTest.java @@ -57,9 +57,9 @@ import com.google.common.collect.ImmutableSet; */ public class TmfTraceManagerTest { - /** Time-out tests after 20 seconds */ + /** Time-out tests after 1 minute. */ @Rule - public TestRule globalTimeout = new Timeout(20, TimeUnit.SECONDS); + public TestRule globalTimeout = new Timeout(1, TimeUnit.MINUTES); private static final int SCALE = ITmfTimestamp.NANOSECOND_SCALE; diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java index 9659da5c88..7a66448828 100644 --- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java +++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java @@ -43,9 +43,9 @@ import org.junit.rules.Timeout; */ public class FunkyTraceTest { - /** Time-out tests after 20 seconds */ + /** Time-out tests after 1 minute. */ @Rule - public TestRule globalTimeout= new Timeout(20, TimeUnit.SECONDS); + public TestRule globalTimeout = new Timeout(1, TimeUnit.MINUTES); // ------------------------------------------------------------------------ // Attributes diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core.tests/src/org/eclipse/tracecompass/lttng2/ust/core/tests/callstack/AbstractProviderTest.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core.tests/src/org/eclipse/tracecompass/lttng2/ust/core/tests/callstack/AbstractProviderTest.java index 6660aa0cd3..dab697e75b 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.ust.core.tests/src/org/eclipse/tracecompass/lttng2/ust/core/tests/callstack/AbstractProviderTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core.tests/src/org/eclipse/tracecompass/lttng2/ust/core/tests/callstack/AbstractProviderTest.java @@ -52,8 +52,9 @@ import org.junit.rules.Timeout; */ public abstract class AbstractProviderTest { - /** Time-out tests after 20 seconds */ - @Rule public TestRule globalTimeout= new Timeout(20, TimeUnit.SECONDS); + /** Time-out tests after 1 minute. */ + @Rule + public TestRule globalTimeout = new Timeout(1, TimeUnit.MINUTES); // ------------------------------------------------------------------------ // Attributes diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/StateSystemAnalysisModuleTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/StateSystemAnalysisModuleTest.java index f57147066d..55d8a51b3e 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/StateSystemAnalysisModuleTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/statesystem/StateSystemAnalysisModuleTest.java @@ -43,9 +43,9 @@ import org.junit.rules.Timeout; */ public class StateSystemAnalysisModuleTest { - /** Time-out tests after 20 seconds */ + /** Time-out tests after 1 minute. */ @Rule - public TestRule globalTimeout= new Timeout(20, TimeUnit.SECONDS); + public TestRule globalTimeout = new Timeout(1, TimeUnit.MINUTES); /** ID of the test state system analysis module */ public static final String MODULE_SS = "org.eclipse.linuxtools.tmf.core.tests.analysis.sstest"; diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/synchronization/TimeOffsetTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/synchronization/TimeOffsetTest.java index 289ca8799d..27ae6d3ac4 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/synchronization/TimeOffsetTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/synchronization/TimeOffsetTest.java @@ -51,9 +51,9 @@ import org.junit.rules.Timeout; @SuppressWarnings("javadoc") public class TimeOffsetTest { - /** Time-out tests after 20 seconds */ + /** Time-out tests after 1 minute. */ @Rule - public TestRule globalTimeout= new Timeout(20, TimeUnit.SECONDS); + public TestRule globalTimeout = new Timeout(1, TimeUnit.MINUTES); // ------------------------------------------------------------------------ // Variables diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java index 53745b17b9..29cabe658d 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java @@ -65,9 +65,9 @@ import org.junit.rules.Timeout; @SuppressWarnings("javadoc") public class TmfTraceTest { - /** Time-out tests after 20 seconds */ + /** Time-out tests after 1 minute. */ @Rule - public TestRule globalTimeout= new Timeout(20, TimeUnit.SECONDS); + public TestRule globalTimeout = new Timeout(1, TimeUnit.MINUTES); // ------------------------------------------------------------------------ // Variables