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/28 17:58:04 UTC
geode git commit: GEODE-3527: increase timeouts for file deletion
Repository: geode
Updated Branches:
refs/heads/develop c5b121175 -> 93ab56ce6
GEODE-3527: increase timeouts for file deletion
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/93ab56ce
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/93ab56ce
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/93ab56ce
Branch: refs/heads/develop
Commit: 93ab56ce60d24bb808bef466ec2a034be455da9c
Parents: c5b1211
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Aug 28 10:42:20 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Aug 28 10:57:49 2017 -0700
----------------------------------------------------------------------
.../AbstractProcessStreamReaderIntegrationTest.java | 5 ++---
.../process/ControlFileWatchdogIntegrationTest.java | 10 +++++-----
2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/93ab56ce/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 c8437fe..dfca0e7 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
@@ -14,7 +14,6 @@
*/
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;
@@ -148,7 +147,7 @@ public abstract class AbstractProcessStreamReaderIntegrationTest {
}
protected ConditionFactory await() {
- return Awaitility.await().atMost(2, MINUTES);
+ return Awaitility.await().atMost(10, MINUTES);
}
protected static String[] createCommandLine(final Class<?> clazz) {
@@ -169,7 +168,7 @@ public abstract class AbstractProcessStreamReaderIntegrationTest {
}
protected void waitUntilProcessStops(final long timeout, final TimeUnit unit) {
- Awaitility.await().atMost(2, MINUTES)
+ Awaitility.await().atMost(timeout, unit)
.until(() -> assertThat(isProcessAlive(process)).isFalse());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/93ab56ce/geode-core/src/test/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java
index 46c81f7..0ea13bc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class ControlFileWatchdogIntegrationTest {
- private static final int TWO_MINUTES_MILLIS = 2 * 60 * 1000;
+ private static final int TEN_MINUTES_MILLIS = 10 * 60 * 1000;
private File directory;
private String requestFileName;
@@ -145,7 +145,7 @@ public class ControlFileWatchdogIntegrationTest {
File file = new EmptyFileWriter(requestFile).createNewFile();
// assert
- verify(requestHandler, timeout(TWO_MINUTES_MILLIS)).handleRequest();
+ verify(requestHandler, timeout(TEN_MINUTES_MILLIS)).handleRequest();
assertThat(file).doesNotExist();
}
@@ -161,7 +161,7 @@ public class ControlFileWatchdogIntegrationTest {
File file = new EmptyFileWriter(requestFile).createNewFile();
// assert
- verify(requestHandler, timeout(TWO_MINUTES_MILLIS)).handleRequest();
+ verify(requestHandler, timeout(TEN_MINUTES_MILLIS)).handleRequest();
await().atMost(2, MINUTES).until(() -> assertThat(file).doesNotExist());
assertThat(file).doesNotExist();
}
@@ -206,7 +206,7 @@ public class ControlFileWatchdogIntegrationTest {
File file = new EmptyFileWriter(requestFile).createNewFile();
// assert
- verify(requestHandler, timeout(TWO_MINUTES_MILLIS)).handleRequest();
+ verify(requestHandler, timeout(TEN_MINUTES_MILLIS)).handleRequest();
await().atMost(2, MINUTES).until(() -> assertThat(watchdog.isAlive()).isFalse());
assertThat(file).doesNotExist();
}
@@ -223,7 +223,7 @@ public class ControlFileWatchdogIntegrationTest {
File file = new EmptyFileWriter(requestFile).createNewFile();
// assert
- verify(requestHandler, timeout(TWO_MINUTES_MILLIS)).handleRequest();
+ verify(requestHandler, timeout(TEN_MINUTES_MILLIS)).handleRequest();
assertThat(watchdog.isAlive()).isTrue();
assertThat(file).doesNotExist();
}