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 E7F971856D for ; Thu, 10 Dec 2015 23:41:38 +0000 (UTC) Received: (qmail 93659 invoked by uid 500); 10 Dec 2015 23:41:38 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 93627 invoked by uid 500); 10 Dec 2015 23:41:38 -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 93618 invoked by uid 99); 10 Dec 2015 23:41:38 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Dec 2015 23:41:38 +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 4B30BC1255 for ; Thu, 10 Dec 2015 23:41:38 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.227 X-Spam-Level: * X-Spam-Status: No, score=1.227 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.554, 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 vQvqe8ULx1Qa for ; Thu, 10 Dec 2015 23:41:32 +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 15B5026606 for ; Thu, 10 Dec 2015 23:41:32 +0000 (UTC) Received: (qmail 93396 invoked by uid 99); 10 Dec 2015 23:41:31 -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; Thu, 10 Dec 2015 23:41:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C9F77E179F; Thu, 10 Dec 2015 23:41:31 +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: <0595612fd92e4fec8df624af89be5b14@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-geode git commit: Remove PROPERTY and DEFAULT constants for forked process. Date: Thu, 10 Dec 2015 23:41:31 +0000 (UTC) Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-291 998206b21 -> 0182de3b4 Remove PROPERTY and DEFAULT constants for forked 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/0182de3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0182de3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0182de3b Branch: refs/heads/feature/GEODE-291 Commit: 0182de3b484eaaee0ba483ed608d1175bdbc10c8 Parents: 998206b Author: Kirk Lund Authored: Thu Dec 10 15:40:40 2015 -0800 Committer: Kirk Lund Committed: Thu Dec 10 15:40:40 2015 -0800 ---------------------------------------------------------------------- .../java/com/gemstone/gemfire/test/process/ProcessWrapper.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0182de3b/gemfire-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java b/gemfire-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java index 0c523d7..67904bc 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java @@ -48,9 +48,6 @@ public class ProcessWrapper { private static final Logger logger = LogService.getLogger(); private static final long PROCESS_TIMEOUT_MILLIS = 10 * 60 * 1000L; // 10 minutes - - protected static final String TIMEOUT_MILLIS_PROPERTY = "process.test.timeoutMillis"; - protected static final long TIMEOUT_MILLIS_DEFAULT = 5 * 60 * 1000; private static final long DELAY = 10; private final boolean headless; @@ -427,7 +424,7 @@ public class ProcessWrapper { private String[] mainArguments = null; private boolean useMainLauncher = true; private boolean headless = true; - private long timeoutMillis = TIMEOUT_MILLIS_DEFAULT; + private long timeoutMillis = PROCESS_TIMEOUT_MILLIS; private boolean inline = false; public Builder() { //nothing