Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4D99610E6F for ; Wed, 26 Mar 2014 21:25:39 +0000 (UTC) Received: (qmail 32379 invoked by uid 500); 26 Mar 2014 21:25:38 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 32284 invoked by uid 500); 26 Mar 2014 21:25:38 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 32275 invoked by uid 99); 26 Mar 2014 21:25:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Mar 2014 21:25:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Mar 2014 21:25:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8950A238883D; Wed, 26 Mar 2014 21:25:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1582067 - /zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java Date: Wed, 26 Mar 2014 21:25:14 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140326212514.8950A238883D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: michim Date: Wed Mar 26 21:25:14 2014 New Revision: 1582067 URL: http://svn.apache.org/r1582067 Log: ZOOKEEPER-1878. Reset zookeeper.datadir.autocreate (Rakesh R via michim) Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java?rev=1582067&r1=1582066&r2=1582067&view=diff ============================================================================== --- zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java (original) +++ zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java Wed Mar 26 21:25:14 2014 @@ -177,16 +177,22 @@ public class ZooKeeperServerMainTest ext public void testWithoutAutoCreateDataLogDir() throws Exception { ClientBase.setupTestEnv(); System.setProperty(FileTxnSnapLog.ZOOKEEPER_DATADIR_AUTOCREATE, "false"); - final int CLIENT_PORT = PortAssignment.unique(); - - MainThread main = new MainThread(CLIENT_PORT, false, null); - String args[] = new String[1]; - args[0] = main.confFile.toString(); - main.start(); + try { + final int CLIENT_PORT = PortAssignment.unique(); - Assert.assertFalse("waiting for server being up", ClientBase - .waitForServerUp("127.0.0.1:" + CLIENT_PORT, - CONNECTION_TIMEOUT / 2)); + MainThread main = new MainThread(CLIENT_PORT, false, null); + String args[] = new String[1]; + args[0] = main.confFile.toString(); + main.start(); + + Assert.assertFalse("waiting for server being up", ClientBase + .waitForServerUp("127.0.0.1:" + CLIENT_PORT, + CONNECTION_TIMEOUT / 2)); + } finally { + // resets "zookeeper.datadir.autocreate" flag + System.setProperty(FileTxnSnapLog.ZOOKEEPER_DATADIR_AUTOCREATE, + FileTxnSnapLog.ZOOKEEPER_DATADIR_AUTOCREATE_DEFAULT); + } } /**