You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2019/06/11 09:03:15 UTC

[lucene-solr] branch master updated: Revert "SOLR-13526: @AwaitsFix failing tests"

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 1942f8c  Revert "SOLR-13526: @AwaitsFix failing tests"
1942f8c is described below

commit 1942f8cb69d0f2f68a87e6d0cda6b7c23f73c4ba
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Tue Jun 11 11:03:00 2019 +0200

    Revert "SOLR-13526: @AwaitsFix failing tests"
    
    This reverts commit 85abdbeb
---
 .../core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java | 1 -
 .../src/test/org/apache/solr/security/JWTAuthPluginIntegrationTest.java  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
index 4bed23f..abbc055 100644
--- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java
@@ -93,7 +93,6 @@ public class BasicAuthIntegrationTest extends SolrCloudAuthTestCase {
   @Test
   //commented 9-Aug-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018
   // commented out on: 17-Feb-2019   @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // annotated on: 24-Dec-2018
-  @AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/SOLR-13526") // 2019-06-07
   public void testBasicAuth() throws Exception {
     boolean isUseV2Api = random().nextBoolean();
     String authcPrefix = "/admin/authentication";
diff --git a/solr/core/src/test/org/apache/solr/security/JWTAuthPluginIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/JWTAuthPluginIntegrationTest.java
index 1a1d6bd..d5cae8a 100644
--- a/solr/core/src/test/org/apache/solr/security/JWTAuthPluginIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/JWTAuthPluginIntegrationTest.java
@@ -164,7 +164,6 @@ public class JWTAuthPluginIntegrationTest extends SolrCloudAuthTestCase {
   }
 
   @Test
-  @AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/SOLR-13526") // 2019-06-07
   public void createCollectionUpdateAndQueryDistributed() throws Exception {
     // Admin request will use PKI inter-node auth from Overseer, and succeed
     createCollection(COLLECTION);