You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/08/22 22:37:46 UTC
[4/4] geode git commit: GEODE-3461: increase test timeouts
GEODE-3461: increase test timeouts
Also fixes:
* GEODE-3505
This closes #729
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/6f7667d9
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/6f7667d9
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/6f7667d9
Branch: refs/heads/develop
Commit: 6f7667d90e56d4dec6f2670a1c46e40b4e354026
Parents: afded2a
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Aug 21 15:38:45 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue Aug 22 15:37:36 2017 -0700
----------------------------------------------------------------------
.../process/AbstractProcessStreamReaderIntegrationTest.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/6f7667d9/geode-core/src/test/java/org/apache/geode/internal/process/AbstractProcessStreamReaderIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/AbstractProcessStreamReaderIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/AbstractProcessStreamReaderIntegrationTest.java
index 18feea7..7f4d60a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/process/AbstractProcessStreamReaderIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/AbstractProcessStreamReaderIntegrationTest.java
@@ -15,6 +15,7 @@
package org.apache.geode.internal.process;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
import static org.apache.commons.lang.SystemUtils.LINE_SEPARATOR;
import static org.apache.geode.internal.process.ProcessUtils.isProcessAlive;
import static org.assertj.core.api.Assertions.assertThat;
@@ -40,7 +41,7 @@ import org.apache.geode.internal.util.StopWatch;
public abstract class AbstractProcessStreamReaderIntegrationTest {
/** Timeout to join to a running ProcessStreamReader thread */
- private static final int READER_JOIN_TIMEOUT_MILLIS = 20 * 1000;
+ private static final int READER_JOIN_TIMEOUT_MILLIS = 2 * 60 * 1000;
/** Sleep timeout for {@link ProcessSleeps} instead of sleeping Long.MAX_VALUE */
private static final int PROCESS_FAIL_SAFE_TIMEOUT_MILLIS = 10 * 60 * 1000;
@@ -48,9 +49,6 @@ public abstract class AbstractProcessStreamReaderIntegrationTest {
/** Additional time for launched processes to live before terminating */
private static final int PROCESS_TIME_TO_LIVE_MILLIS = 3 * 500;
- /** Timeout to wait for a new {@link ProcessStreamReader} to be running */
- private static final int WAIT_FOR_READER_IS_RUNNING_TIMEOUT_MILLIS = 20 * 1000;
-
protected Process process;
protected ProcessStreamReader stderr;
protected ProcessStreamReader stdout;
@@ -149,7 +147,7 @@ public abstract class AbstractProcessStreamReaderIntegrationTest {
}
protected ConditionFactory await() {
- return Awaitility.await().atMost(WAIT_FOR_READER_IS_RUNNING_TIMEOUT_MILLIS, MILLISECONDS);
+ return Awaitility.await().atMost(2, MINUTES);
}
protected static String[] createCommandLine(final Class<?> clazz) {