Repository: geode Updated Branches: refs/heads/develop 5ec406984 -> 36665aef4
GEODE-3326: Fix intermittent ConcurrentDeployDUnitTest failure Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/36665aef Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/36665aef Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/36665aef Branch: refs/heads/develop Commit: 36665aef4a9e837ae99b99e033a2cc2a68bc2029 Parents: 5ec4069 Author: Jared Stewart <jstew...@pivotal.io> Authored: Thu Jul 27 15:19:58 2017 -0700 Committer: Jared Stewart <jstew...@pivotal.io> Committed: Fri Jul 28 14:10:30 2017 -0700 ---------------------------------------------------------------------- .../internal/cli/commands/ConcurrentDeployDUnitTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/36665aef/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java index 559440c..80d0b06 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConcurrentDeployDUnitTest.java @@ -28,6 +28,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import java.io.File; +import java.util.concurrent.TimeUnit; @Category(DistributedTest.class) public class ConcurrentDeployDUnitTest { @@ -64,9 +65,9 @@ public class ConcurrentDeployDUnitTest { AsyncInvocation gfsh2Invocation = gfsh2.invokeAsync(() -> loopThroughDeployAndUndeploys(jar1)); AsyncInvocation gfsh3Invocation = gfsh3.invokeAsync(() -> loopThroughDeployAndUndeploys(jar1)); - gfsh1Invocation.await(); - gfsh2Invocation.await(); - gfsh3Invocation.await(); + gfsh1Invocation.await(5, TimeUnit.MINUTES); + gfsh2Invocation.await(5, TimeUnit.MINUTES); + gfsh3Invocation.await(5, TimeUnit.MINUTES); } @After
