svn commit: r1427618 - /lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java

[ma...@apache.org]

Author: markrmiller
Date: Wed Jan  2 01:26:04 2013
New Revision: 1427618

URL: http://svn.apache.org/viewvc?rev=1427618&view=rev
Log:
tests: only add a delete if the doc add did not fail

Modified:
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java

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=1427618&r1=1427617&r2=1427618&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 Wed Jan  2 01:26:04 2013
@@ -1156,6 +1156,7 @@ public abstract class AbstractFullDistri
       
       while (true && !stop) {
         ++i;
+        boolean addFailed = false;
         
         if (doDeletes && random().nextBoolean() && deletes.size() > 0) {
           Integer delete = deletes.remove(0);
@@ -1179,6 +1180,7 @@ public abstract class AbstractFullDistri
           indexr(id, i, i1, 50, tlong, 50, t1,
               "to come to the aid of their country.");
         } catch (Exception e) {
+          addFailed = true;
           System.err.println("REQUEST FAILED:");
           e.printStackTrace();
           if (e instanceof SolrServerException) {
@@ -1188,7 +1190,7 @@ public abstract class AbstractFullDistri
           fails.incrementAndGet();
         }
         
-        if (doDeletes && random().nextBoolean()) {
+        if (!addFailed && doDeletes && random().nextBoolean()) {
           deletes.add(i);
         }