Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-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 2901210871 for ; Thu, 18 Dec 2014 17:18:50 +0000 (UTC) Received: (qmail 15097 invoked by uid 500); 18 Dec 2014 17:18:48 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 15059 invoked by uid 99); 18 Dec 2014 17:18:48 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Dec 2014 17:18:48 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id B4BD7AC08CC; Thu, 18 Dec 2014 17:18:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1646494 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java Date: Thu, 18 Dec 2014 17:18:48 -0000 To: commits@lucene.apache.org From: shalin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141218171848.B4BD7AC08CC@hades.apache.org> Author: shalin Date: Thu Dec 18 17:18:48 2014 New Revision: 1646494 URL: http://svn.apache.org/r1646494 Log: Compare canonical paths instead of absolute paths Modified: lucene/dev/branches/branch_5x/ (props changed) lucene/dev/branches/branch_5x/solr/ (props changed) lucene/dev/branches/branch_5x/solr/core/ (props changed) lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java?rev=1646494&r1=1646493&r2=1646494&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java (original) +++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java Thu Dec 18 17:18:48 2014 @@ -1131,12 +1131,17 @@ public class CollectionsAPIDistributedZk new File((String) core.getStatistics().get("instanceDir"), "core.properties").exists()); } - - assertEquals( - new File(SolrResourceLoader.normalizeDir(jetty.getSolrHome() + File.separator - + core.getName())).getAbsolutePath(), - new File(SolrResourceLoader.normalizeDir((String) core.getStatistics().get( - "instanceDir"))).getAbsolutePath()); + + try { + assertEquals( + new File(SolrResourceLoader.normalizeDir(jetty.getSolrHome() + File.separator + + core.getName())).getCanonicalPath(), + new File(SolrResourceLoader.normalizeDir((String) core.getStatistics().get( + "instanceDir"))).getCanonicalPath()); + } catch (IOException e) { + log.error("Failed to get canonical path", e); + fail("Failed to get canonical path"); + } } }