Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7C2CD18E09 for ; Fri, 14 Aug 2015 17:07:01 +0000 (UTC) Received: (qmail 60170 invoked by uid 500); 14 Aug 2015 17:07:01 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 60142 invoked by uid 500); 14 Aug 2015 17:07:01 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 60132 invoked by uid 99); 14 Aug 2015 17:07:01 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Aug 2015 17:07:01 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id DFA60C1306 for ; Fri, 14 Aug 2015 17:07:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.775 X-Spam-Level: * X-Spam-Status: No, score=1.775 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id ptNU3QHMa9Pf for ; Fri, 14 Aug 2015 17:06:56 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id C24452055B for ; Fri, 14 Aug 2015 17:06:55 +0000 (UTC) Received: (qmail 60120 invoked by uid 99); 14 Aug 2015 17:06:55 -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; Fri, 14 Aug 2015 17:06:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4AA6AE056D; Fri, 14 Aug 2015 17:06:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.incubator.apache.org Message-Id: <6a69aef5ad314612b721ddb6d9bfa2ae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-geode git commit: GEODE-209: Change subTearDown to destroy process Date: Fri, 14 Aug 2015 17:06:55 +0000 (UTC) Repository: incubator-geode Updated Branches: refs/heads/develop 41d04928b -> 291456769 GEODE-209: Change subTearDown to destroy process Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/29145676 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/29145676 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/29145676 Branch: refs/heads/develop Commit: 29145676960c7d75f1da04cf618f71f6a399eda7 Parents: 41d0492 Author: Kirk Lund Authored: Thu Aug 13 13:22:02 2015 -0700 Committer: Kirk Lund Committed: Fri Aug 14 09:40:55 2015 -0700 ---------------------------------------------------------------------- .../golden/FailWithTimeoutOfWaitForOutputToMatchJUnitTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29145676/gemfire-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithTimeoutOfWaitForOutputToMatchJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithTimeoutOfWaitForOutputToMatchJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithTimeoutOfWaitForOutputToMatchJUnitTest.java index 1b8a312..bd55e6b 100755 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithTimeoutOfWaitForOutputToMatchJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/golden/FailWithTimeoutOfWaitForOutputToMatchJUnitTest.java @@ -16,8 +16,7 @@ public class FailWithTimeoutOfWaitForOutputToMatchJUnitTest extends FailOutputTe private ProcessWrapper process; public void subTearDown() throws Exception { - this.process.waitFor(); - assertFalse(this.process.isAlive()); + this.process.destroy(); } @Override