You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2014/12/18 18:18:48 UTC
svn commit: r1646494 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/
solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
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");
+ }
}
}