You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sentry.apache.org by va...@apache.org on 2017/06/14 00:57:13 UTC
[35/52] [abbrv] sentry git commit: CDH-54364 update CloudDescriptor
mock according to new usage in Solr
CDH-54364 update CloudDescriptor mock according to new usage in Solr
Change-Id: I6ecc15c58b243eafa8ac39d0d8d41529171da91d
Reviewed-on: http://gerrit.sjc.cloudera.com:8080/23057
Tested-by: Jenkins User
Reviewed-by: Mat Crocker <ma...@cloudera.com>
Reviewed-on: http://gerrit.sjc.cloudera.com:8080/23104
Reviewed-by: Alexander Kolbasov <ak...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/6c2fb96d
Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/6c2fb96d
Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/6c2fb96d
Branch: refs/for/cdh5-1.5.1_ha
Commit: 6c2fb96d2f73a4352c1f89e25ee98ce117ae8e2e
Parents: 77b43f1
Author: Mihaly Toth <mt...@cloudera.com>
Authored: Fri May 26 13:54:04 2017 +0200
Committer: Alexander Kolbasov <ak...@cloudera.com>
Committed: Fri May 26 14:47:20 2017 -0700
----------------------------------------------------------------------
.../src/test/java/org/apache/solr/sentry/SentryTestBase.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sentry/blob/6c2fb96d/sentry-solr/solr-sentry-handlers/src/test/java/org/apache/solr/sentry/SentryTestBase.java
----------------------------------------------------------------------
diff --git a/sentry-solr/solr-sentry-handlers/src/test/java/org/apache/solr/sentry/SentryTestBase.java b/sentry-solr/solr-sentry-handlers/src/test/java/org/apache/solr/sentry/SentryTestBase.java
index a7856c6..8661373 100644
--- a/sentry-solr/solr-sentry-handlers/src/test/java/org/apache/solr/sentry/SentryTestBase.java
+++ b/sentry-solr/solr-sentry-handlers/src/test/java/org/apache/solr/sentry/SentryTestBase.java
@@ -92,6 +92,7 @@ public abstract class SentryTestBase extends SolrTestCaseJ4 {
protected SolrQueryRequest prepareCollAndUser(SolrCore core, SolrQueryRequest request,
String collection, String user, boolean onlyOnce) throws Exception {
CloudDescriptor mCloudDescriptor = EasyMock.createMock(CloudDescriptor.class);
+ EasyMock.expect(mCloudDescriptor.getCoreNodeName()).andReturn(core.getCoreDescriptor().getName()).anyTimes();
IExpectationSetters getCollNameExpect = EasyMock.expect(mCloudDescriptor.getCollectionName()).andReturn(collection);
getCollNameExpect.anyTimes();
IExpectationSetters getShardIdExpect = EasyMock.expect(mCloudDescriptor.getShardId()).andReturn("shard1");