Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-9445: Fix failures in TestLocalFSCloudBackupRestore due to changed code path which return SolrExceptions instead of SolrServerExceptions 

(cherry picked from commit df9a642)
This commit is contained in:
Shalin Shekhar Mangar 2016-08-28 00:38:53 +05:30
parent 545ce38714
commit 7cf7bfdf0c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
solr/core/src/test/org/apache/solr/cloud/AbstractCloudBackupRestoreTestCase.java
View File

@ -33,6 +33,7 @@ import org.apache.solr.client.solrj.impl.HttpSolrClient.RemoteSolrException;
import org.apache.solr.client.solrj.request.CollectionAdminRequest; import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.CollectionAdminRequest.ClusterProp; import org.apache.solr.client.solrj.request.CollectionAdminRequest.ClusterProp;
import org.apache.solr.client.solrj.response.RequestStatusState; import org.apache.solr.client.solrj.response.RequestStatusState;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.cloud.DocCollection; import org.apache.solr.common.cloud.DocCollection;
@ -147,9 +148,8 @@ public abstract class AbstractCloudBackupRestoreTestCase extends SolrCloudTestCa
try { try {
backup.process(solrClient); backup.process(solrClient);
fail("This request should have failed since the cluster property value for backup location property is invalid."); fail("This request should have failed since the cluster property value for backup location property is invalid.");
} catch (SolrServerException ex) { } catch (SolrException ex) {
assertTrue(ex.getCause() instanceof RemoteSolrException); assertEquals(ErrorCode.SERVER_ERROR.code, ex.code());
assertEquals(ErrorCode.SERVER_ERROR.code, ((RemoteSolrException)ex.getCause()).code());
} }
String restoreCollectionName = collectionName + "_invalidrequest"; String restoreCollectionName = collectionName + "_invalidrequest";
@ -158,9 +158,8 @@ public abstract class AbstractCloudBackupRestoreTestCase extends SolrCloudTestCa
try { try {
restore.process(solrClient); restore.process(solrClient);
fail("This request should have failed since the cluster property value for backup location property is invalid."); fail("This request should have failed since the cluster property value for backup location property is invalid.");
} catch (SolrServerException ex) { } catch (SolrException ex) {
assertTrue(ex.getCause() instanceof RemoteSolrException); assertEquals(ErrorCode.SERVER_ERROR.code, ex.code());
assertEquals(ErrorCode.SERVER_ERROR.code, ((RemoteSolrException)ex.getCause()).code());
} }
} }