svn commit: r1713669 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java

[sa...@apache.org]

Author: sarowe
Date: Tue Nov 10 15:28:30 2015
New Revision: 1713669

URL: http://svn.apache.org/viewvc?rev=1713669&view=rev
Log:
SOLR-8249: Address OverseerTest.testOverseerStatsReset() failures by switching back from testing for stats on the LEADER operation to testing STATE message stats

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1713669&r1=1713668&r2=1713669&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Tue Nov 10 15:28:30 2015
@@ -716,18 +716,9 @@ public class OverseerTest extends SolrTe
       overseerElector.setup(ec);
       overseerElector.joinElection(ec, false);
 
-      mockController.publishState(collection, "core1", "core_node1", Replica.State.RECOVERING, 1);
+      mockController.publishState(collection, "core1", "core_node1", Replica.State.ACTIVE, 1);
 
-      // Wait till the leader election has finished
-      long maxWaitTimeForLeaderElection = 5000;
-      for (int i = 0; i < maxWaitTimeForLeaderElection / 200; i++) {
-        if (overseer.getStats().getSuccessCount(OverseerAction.LEADER.toLower()) > 0) {
-          break;
-        }
-        Thread.sleep(200);
-      }
       assertNotNull(overseer.getStats());
-      assertEquals(1, (overseer.getStats().getSuccessCount(OverseerAction.LEADER.toLower())));
       assertTrue((overseer.getStats().getSuccessCount(OverseerAction.STATE.toLower())) > 0);
 
       // shut it down
@@ -738,7 +729,7 @@ public class OverseerTest extends SolrTe
       overseerElector.setup(ec);
       overseerElector.joinElection(ec, false);
       assertNotNull(overseer.getStats());
-      assertEquals(0, (overseer.getStats().getSuccessCount(OverseerAction.LEADER.toLower())));
+      assertEquals(0, (overseer.getStats().getSuccessCount(OverseerAction.STATE.toLower())));
 
     } finally {
       close(mockController);