You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by wu...@apache.org on 2023/02/28 06:54:04 UTC
[ambari] branch trunk updated: AMBARI-25878: Fix TopologyManagerTest after merging AMBARI-25186 (#3653)
This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new d26b7307af AMBARI-25878: Fix TopologyManagerTest after merging AMBARI-25186 (#3653)
d26b7307af is described below
commit d26b7307af323bd9f6b93e3b39f738fd5471db22
Author: Kengo Seki <se...@apache.org>
AuthorDate: Tue Feb 28 15:53:57 2023 +0900
AMBARI-25878: Fix TopologyManagerTest after merging AMBARI-25186 (#3653)
---
.../org/apache/ambari/server/topology/TopologyManagerTest.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
index 1acfbb126d..65dc9299c7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
@@ -42,6 +42,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.TreeMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
@@ -489,7 +490,11 @@ public class TopologyManagerTest {
expect(ambariContext.isTopologyResolved(CLUSTER_ID)).andReturn(true).anyTimes();
expect(blueprint.getSecurity()).andReturn(securityConfiguration).anyTimes();
+ expect(securityConfiguration.getDescriptor()).andReturn(Optional.empty());
expect(request.getCredentialsMap()).andReturn(Collections.singletonMap(TopologyManager.KDC_ADMIN_CREDENTIAL, credential));
+ expect(credential.getAlias()).andReturn("").anyTimes();
+ expect(credential.getKey()).andReturn("").anyTimes();
+ expect(credential.getPrincipal()).andReturn("").anyTimes();
bpConfiguration.setProperty(KerberosHelper.KERBEROS_ENV, KerberosHelper.KDC_TYPE, "none");
@@ -515,7 +520,11 @@ public class TopologyManagerTest {
expect(ambariContext.isTopologyResolved(CLUSTER_ID)).andReturn(true).anyTimes();
expect(blueprint.getSecurity()).andReturn(securityConfiguration).anyTimes();
+ expect(securityConfiguration.getDescriptor()).andReturn(Optional.empty());
expect(request.getCredentialsMap()).andReturn(Collections.singletonMap(TopologyManager.KDC_ADMIN_CREDENTIAL, credential));
+ expect(credential.getAlias()).andReturn("").anyTimes();
+ expect(credential.getKey()).andReturn("").anyTimes();
+ expect(credential.getPrincipal()).andReturn("").anyTimes();
bpConfiguration.setProperty(KerberosHelper.KERBEROS_ENV, KerberosHelper.MANAGE_IDENTITIES, "false");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ambari.apache.org
For additional commands, e-mail: commits-help@ambari.apache.org