lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject svn commit: r1387099 - in /lucene/dev/trunk/solr: contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/ core/src/test-files/solr/collection1/conf/ core/src/test/org/apache/solr/ core/src/test/org/apache/solr/handler/ core/src/test/org/...
Date Tue, 18 Sep 2012 11:40:14 GMT
Author: erick
Date: Tue Sep 18 11:40:13 2012
New Revision: 1387099

URL: http://svn.apache.org/viewvc?rev=1387099&view=rev
Log:
Fixes for SOLR-3846 (very long tests on OS X for TestReplicationHandler)

Modified:
    lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
    lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolrJ.java
    lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solr-data-config.xml
    lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java
    lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java
    lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
    lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
    lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
    lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
    lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java

Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
(original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
Tue Sep 18 11:40:13 2012
@@ -47,7 +47,7 @@ public class TestSolrEntityProcessorEndT
   
   private static Logger LOG = LoggerFactory.getLogger(TestSolrEntityProcessorEndToEnd.class);
   
-  //rivate static final String SOLR_SOURCE_URL = "http://localhost:8983/solr";
+  //rivate static final String SOLR_SOURCE_URL = "http://127.0.0.1:8983/solr";
   private static final String SOLR_CONFIG = "dataimport-solrconfig.xml";
   private static final String SOLR_SCHEMA = "dataimport-schema.xml";
   private static final String SOLR_HOME = "dih/solr";
@@ -95,7 +95,7 @@ public class TestSolrEntityProcessorEndT
   }
   
   private static String getSourceUrl(int port) {
-    return "http://localhost:" + port + "/solr";
+    return "http://127.0.0.1:" + port + "/solr";
   }
   
   //TODO: fix this test to close its directories

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
(original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
Tue Sep 18 11:40:13 2012
@@ -55,7 +55,7 @@
       <str name="confFiles">schema.xml</str>
     </lst>
     <lst name="slave">
-      <str name="masterUrl">http://localhost:TEST_PORT/solr/replication</str>
+      <str name="masterUrl">http://127.0.0.1:TEST_PORT/solr/replication</str>
       <str name="pollInterval">00:00:01</str>
     </lst>
   </requestHandler>

Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml Tue
Sep 18 11:40:13 2012
@@ -51,7 +51,7 @@
 
   <requestHandler name="/replication" class="solr.ReplicationHandler">
 	<lst name="slave">
-		<str name="masterUrl">http://localhost:TEST_PORT/solr</str>
+		<str name="masterUrl">http://127.0.0.1:TEST_PORT/solr</str>
 		<str name="pollInterval">00:00:01</str>
         <str name="compression">COMPRESSION</str>
      </lst>

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java Tue
Sep 18 11:40:13 2012
@@ -149,7 +149,7 @@ public class AnalysisAfterCoreReloadTest
   private SolrServer createServer( String name ) {
     try {
       // setup the server...
-      String url = "http://localhost:"+port+context+"/"+name;
+      String url = "http://127.0.0.1:"+port+context+"/"+name;
       HttpSolrServer s = new HttpSolrServer( url );
       s.setConnectionTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT);
       s.setDefaultMaxConnectionsPerHost(100);
@@ -171,4 +171,4 @@ public class AnalysisAfterCoreReloadTest
     return "solrconfig.xml";
   }
 
-}
\ No newline at end of file
+}

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java Tue Sep
18 11:40:13 2012
@@ -50,7 +50,7 @@ public class TestSolrCoreProperties exte
     solrJetty = new JettySolrRunner(getHomeDir(), "/solr", 0);
 
     solrJetty.start();
-    String url = "http://localhost:" + solrJetty.getLocalPort() + "/solr";
+    String url = "http://127.0.0.1:" + solrJetty.getLocalPort() + "/solr";
     client = new HttpSolrServer(url);
 
   }

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
(original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
Tue Sep 18 11:40:13 2012
@@ -132,7 +132,7 @@ public class TestReplicationHandler exte
   private static SolrServer createNewSolrServer(int port) {
     try {
       // setup the server...
-      String url = "http://localhost:" + port + context;
+      String url = "http://127.0.0.1:" + port + context;
       HttpSolrServer s = new HttpSolrServer(url);
       s.setDefaultMaxConnectionsPerHost(100);
       s.setMaxTotalConnections(100);
@@ -316,7 +316,7 @@ public class TestReplicationHandler exte
       index(masterClient, "id", i, "name", "name = " + i);
     }
 
-    String masterUrl = "http://localhost:" + masterJetty.getLocalPort() + "/solr/replication?command=disableReplication";
+    String masterUrl = "http://127.0.0.1:" + masterJetty.getLocalPort() + "/solr/replication?command=disableReplication";
     URL url = new URL(masterUrl);
     InputStream stream = url.openStream();
     try {
@@ -353,7 +353,7 @@ public class TestReplicationHandler exte
     slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response");
     assertEquals(1, slaveQueryResult.getNumFound());
 
-    masterUrl = "http://localhost:" + masterJetty.getLocalPort() + "/solr/replication?command=enableReplication";
+    masterUrl = "http://127.0.0.1:" + masterJetty.getLocalPort() + "/solr/replication?command=enableReplication";
     url = new URL(masterUrl);
     stream = url.openStream();
     try {
@@ -468,7 +468,7 @@ public class TestReplicationHandler exte
     assertEquals(null, cmp);
 
     // start stop polling test
-    String slaveURL = "http://localhost:" + slaveJetty.getLocalPort() + "/solr/replication?command=disablepoll";
+    String slaveURL = "http://127.0.0.1:" + slaveJetty.getLocalPort() + "/solr/replication?command=disablepoll";
     URL url = new URL(slaveURL);
     InputStream stream = url.openStream();
     try {
@@ -494,7 +494,7 @@ public class TestReplicationHandler exte
     assertEquals(nDocs, slaveQueryResult.getNumFound());
 
     // re-enable replication
-    slaveURL = "http://localhost:" + slaveJetty.getLocalPort() + "/solr/replication?command=enablepoll";
+    slaveURL = "http://127.0.0.1:" + slaveJetty.getLocalPort() + "/solr/replication?command=enablepoll";
     url = new URL(slaveURL);
     stream = url.openStream();
     try {
@@ -529,8 +529,8 @@ public class TestReplicationHandler exte
     assertEquals(nDocs, masterQueryResult.getNumFound());
 
     // snappull
-    String masterUrl = "http://localhost:" + slaveJetty.getLocalPort() + "/solr/replication?command=fetchindex&masterUrl=";
-    masterUrl += "http://localhost:" + masterJetty.getLocalPort() + "/solr/replication";
+    String masterUrl = "http://127.0.0.1:" + slaveJetty.getLocalPort() + "/solr/replication?command=fetchindex&masterUrl=";
+    masterUrl += "http://127.0.0.1:" + masterJetty.getLocalPort() + "/solr/replication";
     URL url = new URL(masterUrl);
     InputStream stream = url.openStream();
     try {
@@ -555,8 +555,8 @@ public class TestReplicationHandler exte
 
     slaveClient.commit();
     
-    masterUrl = "http://localhost:" + masterJetty.getLocalPort() + "/solr/replication?command=fetchindex&masterUrl=";
-    masterUrl += "http://localhost:" + slaveJetty.getLocalPort() + "/solr/replication";
+    masterUrl = "http://127.0.0.1:" + masterJetty.getLocalPort() + "/solr/replication?command=fetchindex&masterUrl=";
+    masterUrl += "http://127.0.0.1:" + slaveJetty.getLocalPort() + "/solr/replication";
     url = new URL(masterUrl);
     stream = url.openStream();
     try {
@@ -820,7 +820,7 @@ public class TestReplicationHandler exte
       @Override
       public void run() {
         String masterUrl = 
-          "http://localhost:" + masterJetty.getLocalPort() + "/solr/replication?command="
+ ReplicationHandler.CMD_BACKUP + 
+          "http://127.0.0.1:" + masterJetty.getLocalPort() + "/solr/replication?command="
+ ReplicationHandler.CMD_BACKUP + 
           (addNumberToKeepInRequest ? "&" + backupKeepParamName + "=1" : "");
         URL url;
         InputStream stream = null;
@@ -850,7 +850,7 @@ public class TestReplicationHandler exte
       }
       @Override
       public void run() {
-        String masterUrl = "http://localhost:" + masterJetty.getLocalPort() + "/solr/replication?command="
+ ReplicationHandler.CMD_DETAILS;
+        String masterUrl = "http://127.0.0.1:" + masterJetty.getLocalPort() + "/solr/replication?command="
+ ReplicationHandler.CMD_DETAILS;
         URL url;
         InputStream stream = null;
         try {

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java Tue Sep
18 11:40:13 2012
@@ -81,7 +81,7 @@ public class TestBinaryField extends Luc
     jetty.start();
     port = jetty.getLocalPort();
 
-    String url = "http://localhost:" + jetty.getLocalPort() + context;
+    String url = "http://127.0.0.1:" + jetty.getLocalPort() + context;
     server = new HttpSolrServer(url);
   }
 

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolrJ.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolrJ.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolrJ.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSolrJ.java Tue Sep 18 11:40:13
2012
@@ -48,7 +48,7 @@ public class TestSolrJ extends SolrTestC
   public static void main(String[] args) throws Exception {
     // String addr = "http://odin.local:80/solr";
     // String addr = "http://odin.local:8983/solr";
-    String addr = "http://localhost:8983/solr";
+    String addr = "http://127.0.0.1:8983/solr";
 
     int i = 0;
     final int nDocs = Integer.parseInt(args[i++]);
@@ -162,7 +162,7 @@ public class TestSolrJ extends SolrTestC
 
 
   public void doCommitPerf() throws Exception {
-    HttpSolrServer client = new HttpSolrServer("http://localhost:8983/solr");
+    HttpSolrServer client = new HttpSolrServer("http://127.0.0.1:8983/solr");
 
     long start = System.currentTimeMillis();
 

Modified: lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solr-data-config.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solr-data-config.xml?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solr-data-config.xml (original)
+++ lucene/dev/trunk/solr/example/example-DIH/solr/solr/conf/solr-data-config.xml Tue Sep
18 11:40:13 2012
@@ -17,6 +17,6 @@
 
 <dataConfig>
   <document>
-    <entity name="sep" processor="SolrEntityProcessor" url="http://localhost:8983/solr/db
" query="*:*"/>
+    <entity name="sep" processor="SolrEntityProcessor" url="http://127.0.0.1:8983/solr/db
" query="*:*"/>
   </document>
 </dataConfig>

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java
Tue Sep 18 11:40:13 2012
@@ -41,7 +41,7 @@ public class SolrExampleBinaryTest exten
   {
     try {
       // setup the server...
-      String url = "http://localhost:"+port+context;
+      String url = "http://127.0.0.1:"+port+context;
       HttpSolrServer s = new HttpSolrServer( url );
       s.setConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT);
       s.setDefaultMaxConnectionsPerHost(100);

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java
Tue Sep 18 11:40:13 2012
@@ -36,7 +36,7 @@ public class SolrExampleXMLTest extends 
   @Override
   public SolrServer createNewSolrServer() {
     try {
-      String url = "http://localhost:" + port + context;
+      String url = "http://127.0.0.1:" + port + context;
       HttpSolrServer s = new HttpSolrServer(url);
       s.setConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT);
       s.setDefaultMaxConnectionsPerHost(100);

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
Tue Sep 18 11:40:13 2012
@@ -241,7 +241,7 @@ public class TestLBHttpSolrServer extend
     }
 
     public String getUrl() {
-      return "http://localhost:" + port + "/solr";
+      return "http://127.0.0.1:" + port + "/solr";
     }
 
     public String getSchemaFile() {

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
Tue Sep 18 11:40:13 2012
@@ -92,7 +92,7 @@ public class JettyWebappTest extends Luc
     // Currently not an extensive test, but it does fire up the JSP pages and make 
     // sure they compile ok
     
-    String adminPath = "http://localhost:"+port+context+"/";
+    String adminPath = "http://127.0.0.1:"+port+context+"/";
     byte[] bytes = IOUtils.toByteArray( new URL(adminPath).openStream() );
     assertNotNull( bytes ); // real error will be an exception
   }

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
Tue Sep 18 11:40:13 2012
@@ -94,7 +94,7 @@ public class MultiCoreExampleJettyTest e
   {
     try {
       // setup the server...
-      String url = "http://localhost:"+port+context+"/"+name;
+      String url = "http://127.0.0.1:"+port+context+"/"+name;
       HttpSolrServer s = new HttpSolrServer( url );
       s.setConnectionTimeout(SolrTestCaseJ4.DEFAULT_CONNECTION_TIMEOUT);
       s.setDefaultMaxConnectionsPerHost(100);
@@ -139,7 +139,7 @@ public class MultiCoreExampleJettyTest e
     assertEquals( 1, r.process( getSolrCore1() ).getResults().size() );
     
     // Distributed
-    String baseURL = "localhost:"+port+context+"/";
+    String baseURL = "127.0.0.1:"+port+context+"/";
     q = new SolrQuery( "*:*" );
     q.set( ShardParams.SHARDS, baseURL+"core0,"+baseURL+"core1" );
     q.set( "fl", "id,s:[shard]" );

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
Tue Sep 18 11:40:13 2012
@@ -42,7 +42,7 @@ public class SolrExampleJettyTest extend
   {
     try {
       // setup the server...
-      String url = "http://localhost/?core=xxx";
+      String url = "http://127.0.0.1/?core=xxx";
       HttpSolrServer s = new HttpSolrServer( url );
       Assert.fail( "CommonsHttpSolrServer should not allow a path with a parameter: "+s.getBaseURL()
);
     }

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
(original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
Tue Sep 18 11:40:13 2012
@@ -44,7 +44,7 @@ public class SolrExampleStreamingTest ex
   {
     try {
       // setup the server...
-      String url = "http://localhost:"+port+context;       // smaller queue size hits locks
more often
+      String url = "http://127.0.0.1:"+port+context;       // smaller queue size hits locks
more often
       ConcurrentUpdateSolrServer s = new ConcurrentUpdateSolrServer( url, 2, 5 ) {
         
         public Throwable lastError = null;

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
(original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
Tue Sep 18 11:40:13 2012
@@ -86,8 +86,8 @@ public abstract class BaseDistributedSea
   protected String shards;
   protected String[] shardsArr;
   // Some ISPs redirect to their own web site for domains that don't exist, causing this
to fail
-  // protected String[] deadServers = {"does_not_exist_54321.com:33331/solr","localhost:33332/solr"};
-  protected String[] deadServers = {"[::1]:33332/solr"};
+  // protected String[] deadServers = {"does_not_exist_54321.com:33331/solr","127.0.0.1:33332/solr"};
+  protected String[] deadServers = {"[ff01::114]:33332/solr", "[ff01::083]:33332/solr", "[ff01::213]:33332/solr"};
   protected File testDir;
   protected SolrServer controlClient;
 
@@ -267,7 +267,7 @@ public abstract class BaseDistributedSea
   protected SolrServer createNewSolrServer(int port) {
     try {
       // setup the server...
-      String url = "http://localhost:" + port + context;
+      String url = "http://127.0.0.1:" + port + context;
       HttpSolrServer s = new HttpSolrServer(url);
       s.setConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT);
       s.setDefaultMaxConnectionsPerHost(100);

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java Tue
Sep 18 11:40:13 2012
@@ -86,7 +86,7 @@ abstract public class SolrJettyTestBase 
     if (jetty != null) {
       try {
         // setup the server...
-        String url = "http://localhost:"+port+context;
+        String url = "http://127.0.0.1:"+port+context;
         HttpSolrServer s = new HttpSolrServer( url );
         s.setConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT);
         s.setDefaultMaxConnectionsPerHost(100);

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
(original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java
Tue Sep 18 11:40:13 2012
@@ -91,7 +91,7 @@ public abstract class AbstractDistribZkT
       JettySolrRunner j = createJetty(jettyHome, null, "shard" + (i + 2));
       jettys.add(j);
       clients.add(createNewSolrServer(j.getLocalPort()));
-      sb.append("localhost:").append(j.getLocalPort()).append(context);
+      sb.append("127.0.0.1:").append(j.getLocalPort()).append(context);
     }
 
     shards = sb.toString();

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1387099&r1=1387098&r2=1387099&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
(original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
Tue Sep 18 11:40:13 2012
@@ -334,8 +334,8 @@ public abstract class AbstractFullDistri
       JettySolrRunner j = this.jettys.get(i);
       JettySolrRunner j2 = this.jettys.get(i + (numJettys / 2 - 1));
       if (sb.length() > 0) sb.append(',');
-      sb.append("localhost:").append(j.getLocalPort()).append(context);
-      sb.append("|localhost:").append(j2.getLocalPort()).append(context);
+      sb.append("127.0.0.1:").append(j.getLocalPort()).append(context);
+      sb.append("|127.0.0.1:").append(j2.getLocalPort()).append(context);
     }
     shards = sb.toString();
     
@@ -1198,7 +1198,7 @@ public abstract class AbstractFullDistri
   protected SolrServer createNewSolrServer(int port) {
     try {
       // setup the server...
-      String url = "http://localhost:" + port + context + "/"
+      String url = "http://127.0.0.1:" + port + context + "/"
           + DEFAULT_COLLECTION;
       HttpSolrServer s = new HttpSolrServer(url);
       s.setConnectionTimeout(DEFAULT_CONNECTION_TIMEOUT);



Mime
View raw message