svn commit: r819514 - /lucene/solr/trunk/src/test/org/apache/solr/handler/TestReplicationHandler.java

[yonik]

Author: yonik
Date: Mon Sep 28 12:44:15 2009
New Revision: 819514

URL: http://svn.apache.org/viewvc?rev=819514&view=rev
Log:
SOLR-1469: fix race in TestReplicationHandler

Modified:
    
lucene/solr/trunk/src/test/org/apache/solr/handler/TestReplicationHandler.java

Modified: 
lucene/solr/trunk/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=819514&r1=819513&r2=819514&view=diff
==============================================================================
--- 
lucene/solr/trunk/src/test/org/apache/solr/handler/TestReplicationHandler.java 
(original)
+++ 
lucene/solr/trunk/src/test/org/apache/solr/handler/TestReplicationHandler.java 
Mon Sep 28 12:44:15 2009
@@ -397,14 +397,9 @@
   public void testReplicateAfterWrite2Slave() throws Exception {
 
     //add 500 docs to master
-    for (int i = 0; i < 500; i++)
+    for (int i = 0; i < 500; i++) {
       index(masterClient, "id", i, "name", "name = " + i);
-
-    masterClient.commit();
-
-    NamedList masterQueryRsp = query("*:*", masterClient);
-    SolrDocumentList masterQueryResult = (SolrDocumentList) 
masterQueryRsp.get("response");
-    assertEquals(500, masterQueryResult.getNumFound());
+    }
 
     String masterUrl = "http://localhost:"; + masterJetty.getLocalPort() + 
"/solr/replication?command=disableReplication";
     URL url = new URL(masterUrl);
@@ -415,6 +410,12 @@
       //e.printStackTrace();
     }
 
+    masterClient.commit();
+
+    NamedList masterQueryRsp = query("*:*", masterClient);
+    SolrDocumentList masterQueryResult = (SolrDocumentList) 
masterQueryRsp.get("response");
+    assertEquals(500, masterQueryResult.getNumFound());
+
     index(slaveClient, "id", 555, "name", "name = " + 555);
     slaveClient.commit(true, true);