Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 88471 invoked from network); 26 Apr 2010 19:59:43 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 Apr 2010 19:59:43 -0000 Received: (qmail 37163 invoked by uid 500); 26 Apr 2010 19:59:43 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 37118 invoked by uid 500); 26 Apr 2010 19:59:43 -0000 Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zookeeper-dev@ Delivered-To: mailing list zookeeper-commits@hadoop.apache.org Received: (qmail 37106 invoked by uid 99); 26 Apr 2010 19:59:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Apr 2010 19:59:42 +0000 X-ASF-Spam-Status: No, hits=-1320.6 required=10.0 tests=ALL_TRUSTED,AWL 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; Mon, 26 Apr 2010 19:59:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9EDC023889B6; Mon, 26 Apr 2010 19:58:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r938212 - in /hadoop/zookeeper/trunk: CHANGES.txt src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java Date: Mon, 26 Apr 2010 19:58:59 -0000 To: zookeeper-commits@hadoop.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100426195859.9EDC023889B6@eris.apache.org> Author: phunt Date: Mon Apr 26 19:58:59 2010 New Revision: 938212 URL: http://svn.apache.org/viewvc?rev=938212&view=rev Log: ZOOKEEPER-734. QuorumPeerTestBase.java and ZooKeeperServerMainTest.java do not handle windows path correctly Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=938212&r1=938211&r2=938212&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Mon Apr 26 19:58:59 2010 @@ -29,6 +29,9 @@ BUGFIXES: ZOOKEEPER-738. zookeeper.jute.h fails to compile with -pedantic (Jozef Hatala via phunt) + ZOOKEEPER-734. QuorumPeerTestBase.java and ZooKeeperServerMainTest.java + do not handle windows path correctly (Vishal K via phunt) + IMPROVEMENTS: ZOOKEEPER-724. Improve junit test integration - log harness information (phunt via mahadev) Modified: hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java?rev=938212&r1=938211&r2=938212&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java (original) +++ hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java Mon Apr 26 19:58:59 2010 @@ -61,8 +61,15 @@ public class ZooKeeperServerMainTest ext if (!dataDir.mkdir()) { throw new IOException("unable to mkdir " + dataDir); } - fwriter.write("dataDir=" + dataDir.toString() + "\n"); - + + // Convert windows path to UNIX to avoid problems with "\" + String dir = dataDir.toString(); + String osname = java.lang.System.getProperty("os.name"); + if (osname.toLowerCase().contains("windows")) { + dir = dir.replace('\\', '/'); + } + fwriter.write("dataDir=" + dir + "\n"); + fwriter.write("clientPort=" + clientPort + "\n"); fwriter.flush(); fwriter.close(); Modified: hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java?rev=938212&r1=938211&r2=938212&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java (original) +++ hadoop/zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java Mon Apr 26 19:58:59 2010 @@ -72,8 +72,15 @@ public class QuorumPeerTestBase extends if (!dataDir.mkdir()) { throw new IOException("Unable to mkdir " + dataDir); } - fwriter.write("dataDir=" + dataDir.toString() + "\n"); + // Convert windows path to UNIX to avoid problems with "\" + String dir = dataDir.toString(); + String osname = java.lang.System.getProperty("os.name"); + if (osname.toLowerCase().contains("windows")) { + dir = dir.replace('\\', '/'); + } + fwriter.write("dataDir=" + dir + "\n"); + fwriter.write("clientPort=" + clientPort + "\n"); fwriter.write(quorumCfgSection + "\n"); fwriter.flush();