From 93af3a81c8f612cf4729a6ce5832d04d0840a86d Mon Sep 17 00:00:00 2001 From: Hrishikesh Gadre Date: Tue, 31 Jan 2017 14:29:44 -0800 Subject: [PATCH] [SOLR-10053] Ignore delegation token cancelation tests until HADOOP-14044 is fixed --- .../apache/solr/cloud/TestSolrCloudWithDelegationTokens.java | 3 ++- .../solr/security/hadoop/TestDelegationWithHadoopAuth.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java index c3fa813dd41a..d5a1180098b0 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithDelegationTokens.java @@ -137,7 +137,7 @@ private void cancelDelegationToken(String token, int expectedStatusCode, HttpSol DelegationTokenRequest.Cancel cancel = new DelegationTokenRequest.Cancel(token); try { cancel.process(client); - assertEquals(HttpStatus.SC_OK, expectedStatusCode); + assertEquals(expectedStatusCode, HttpStatus.SC_OK); } catch (HttpSolrClient.RemoteSolrException ex) { assertEquals(expectedStatusCode, ex.code()); } @@ -282,6 +282,7 @@ public void testDelegationTokenCancel() throws Exception { } @Test + @AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/HADOOP-14044") public void testDelegationTokenCancelFail() throws Exception { // cancel a bogus token cancelDelegationToken("BOGUS", ErrorCode.NOT_FOUND.code, solrClientPrimary); diff --git a/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java b/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java index 37c6b8cbe9bf..c154f5d88421 100644 --- a/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java +++ b/solr/core/src/test/org/apache/solr/security/hadoop/TestDelegationWithHadoopAuth.java @@ -23,6 +23,7 @@ import org.apache.hadoop.util.Time; import org.apache.http.HttpStatus; import org.apache.lucene.util.Constants; +import org.apache.lucene.util.LuceneTestCase.AwaitsFix; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.embedded.JettySolrRunner; @@ -125,7 +126,7 @@ private void cancelDelegationToken(String token, int expectedStatusCode, HttpSol DelegationTokenRequest.Cancel cancel = new DelegationTokenRequest.Cancel(token); try { cancel.process(client); - assertEquals(HttpStatus.SC_OK, expectedStatusCode); + assertEquals(expectedStatusCode, HttpStatus.SC_OK); } catch (HttpSolrClient.RemoteSolrException ex) { assertEquals(expectedStatusCode, ex.code()); } @@ -268,6 +269,7 @@ public void testDelegationTokenCancel() throws Exception { } @Test + @AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/HADOOP-14044") public void testDelegationTokenCancelFail() throws Exception { // cancel a bogus token cancelDelegationToken("BOGUS", ErrorCode.NOT_FOUND.code, primarySolrClient);