Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B83CE200D08 for ; Wed, 23 Aug 2017 00:36:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B6E9F167B9A; Tue, 22 Aug 2017 22:36:14 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0BA4A167B95 for ; Wed, 23 Aug 2017 00:36:13 +0200 (CEST) Received: (qmail 51217 invoked by uid 500); 22 Aug 2017 22:36:09 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 47676 invoked by uid 99); 22 Aug 2017 22:36:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Aug 2017 22:36:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 53EAFF5F06; Tue, 22 Aug 2017 22:36:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bschuchardt@apache.org To: commits@geode.apache.org Date: Tue, 22 Aug 2017 22:36:34 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [32/48] geode git commit: GEODE-2859: Fix ShowDeadlockDUnitTest archived-at: Tue, 22 Aug 2017 22:36:14 -0000 GEODE-2859: Fix ShowDeadlockDUnitTest Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d11e1b9e Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d11e1b9e Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d11e1b9e Branch: refs/heads/feature/GEODE-3447 Commit: d11e1b9ee9a209e130263dcf40c898c1be9e855a Parents: 68e8b7e Author: Jared Stewart Authored: Fri Aug 18 14:36:40 2017 -0700 Committer: Jared Stewart Committed: Mon Aug 21 15:38:03 2017 -0700 ---------------------------------------------------------------------- .../cli/commands/ShowDeadlockDUnitTest.java | 39 +++++++++++--------- 1 file changed, 22 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/d11e1b9e/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java index 8b5c80e..cd68350 100755 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java @@ -18,6 +18,25 @@ import static org.apache.geode.test.dunit.Assert.assertEquals; import static org.apache.geode.test.dunit.Assert.assertTrue; import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM; +import java.io.File; +import java.io.IOException; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +import org.apache.commons.io.FileUtils; +import org.awaitility.Awaitility; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; + import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.FunctionService; @@ -36,23 +55,6 @@ import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder; -import org.awaitility.Awaitility; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.experimental.categories.Category; - -import java.io.File; -import java.io.IOException; -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; /** * This DUnit tests uses same code as GemFireDeadlockDetectorDUnitTest and uses the command @@ -106,6 +108,7 @@ public class ShowDeadlockDUnitTest extends JUnit4CacheTestCase { assertEquals(null, detect.find().findCycle()); File outputFile = new File(temporaryFolder.getRoot(), "dependency.txt"); + String showDeadlockCommand = new CommandStringBuilder(CliStrings.SHOW_DEADLOCK) .addOption(CliStrings.SHOW_DEADLOCK__DEPENDENCIES__FILE, outputFile.getName()).toString(); @@ -130,12 +133,14 @@ public class ShowDeadlockDUnitTest extends JUnit4CacheTestCase { lockTheLocks(vm1, member0); File outputFile = new File(temporaryFolder.getRoot(), "dependency.txt"); + String showDeadlockCommand = new CommandStringBuilder(CliStrings.SHOW_DEADLOCK) .addOption(CliStrings.SHOW_DEADLOCK__DEPENDENCIES__FILE, outputFile.getName()).toString(); CommandStatement showDeadlocksCommand = new CommandProcessor().createCommandStatement(showDeadlockCommand, Collections.emptyMap()); Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> { + FileUtils.deleteQuietly(outputFile); Result result = showDeadlocksCommand.process(); try { result.saveIncomingFiles(temporaryFolder.getRoot().getAbsolutePath());