You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2019/04/01 16:38:35 UTC

[lucene-solr] branch branch_8x updated: SOLR-12028: BadApple and AwaitsFix annotations usage

This is an automated email from the ASF dual-hosted git repository.

erick pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/branch_8x by this push:
     new d420382  SOLR-12028: BadApple and AwaitsFix annotations usage
d420382 is described below

commit d420382d041ea078598451e882abff94e3039611
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Mon Apr 1 09:27:33 2019 -0700

    SOLR-12028: BadApple and AwaitsFix annotations usage
    
    (cherry picked from commit e04a28e1400514e104a867f5d6c76f8761ff348a)
---
 .../core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java | 2 +-
 solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java         | 2 +-
 .../core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java | 2 +-
 solr/core/src/test/org/apache/solr/cloud/TestWithCollection.java        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java
index 1913b5c..99f7d53 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java
@@ -275,7 +275,7 @@ public class TestIndexWriterOnVMError extends LuceneTestCase {
   }
   
   @Nightly
-  @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 14-Oct-2018
+  // commented out on: 01-Apr-2019   @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 14-Oct-2018
   public void testCheckpoint() throws Exception {
     final Random r = new Random(random().nextLong());
     doTest(new Failure() {
diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
index 8249f4d..62a891a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
@@ -88,7 +88,7 @@ public class DeleteReplicaTest extends SolrCloudTestCase {
   }
 
   @Test
-  @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // annotated on: 24-Dec-2018
+  // commented out on: 01-Apr-2019   @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // annotated on: 24-Dec-2018
   public void deleteLiveReplicaTest() throws Exception {
 
     final String collectionName = "delLiveColl";
diff --git a/solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java b/solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java
index ed01793..a91d5f7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LegacyCloudClusterPropTest.java
@@ -73,7 +73,7 @@ public class LegacyCloudClusterPropTest extends SolrCloudTestCase {
   @Test
   //2018-06-18 (commented) @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028")
   //Commented 14-Oct-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 17-Aug-2018
-  @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // annotated on: 24-Dec-2018
+  // commented out on: 01-Apr-2019   @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // annotated on: 24-Dec-2018
   public void testCreateCollectionSwitchLegacyCloud() throws Exception {
     createAndTest("legacyTrue", true);
     createAndTest("legacyFalse", false);
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestWithCollection.java b/solr/core/src/test/org/apache/solr/cloud/TestWithCollection.java
index 5d7aa9f..77baa69 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestWithCollection.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestWithCollection.java
@@ -391,7 +391,7 @@ public class TestWithCollection extends SolrCloudTestCase {
    * Tests that when a new node is added to the cluster and autoscaling framework
    * moves replicas to the new node, we maintain all co-locating guarantees
    */
-  @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 15-Sep-2018
+  // commented out on: 01-Apr-2019   @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 15-Sep-2018
   public void testNodeAdded() throws Exception  {
     String prefix = "testNodeAdded";
     String xyz = prefix + "_xyz";