Repository: ambari Updated Branches: refs/heads/branch-2.5 cae9ee29d -> 3d9cf0516
AMBARI-19741. Ambari Server Unit Test failure on branch-2.5/trunk for testUpdateConfigForceSecurityEnabled. (Eugene Chekanskiy via yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3d9cf051 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3d9cf051 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3d9cf051 Branch: refs/heads/branch-2.5 Commit: 3d9cf0516506591efbf4714bbc8245ad4b41f16c Parents: cae9ee2 Author: Yusaku Sako <[email protected]> Authored: Mon Jan 30 11:27:10 2017 -0800 Committer: Yusaku Sako <[email protected]> Committed: Mon Jan 30 11:27:10 2017 -0800 ---------------------------------------------------------------------- .../UpdateKerberosConfigsServerActionTest.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3d9cf051/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java index 98b3f00..733d815 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java @@ -22,7 +22,7 @@ import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.io.File; import java.util.Collection; @@ -37,6 +37,7 @@ import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.ConfigHelper; import org.apache.ambari.server.state.stack.OsFamily; import org.easymock.Capture; +import org.easymock.CaptureType; import org.easymock.EasyMockSupport; import org.junit.Before; import org.junit.Rule; @@ -152,8 +153,8 @@ public class UpdateKerberosConfigsServerActionTest extends EasyMockSupport{ ConfigHelper configHelper = injector.getInstance(ConfigHelper.class); - Capture<String> configTypes = Capture.newInstance(); - Capture<Map<String, String>> configUpdates = Capture.newInstance(); + Capture<String> configTypes = Capture.newInstance(CaptureType.ALL); + Capture<Map<String, String>> configUpdates = Capture.newInstance(CaptureType.ALL); configHelper.updateConfigType(anyObject(Cluster.class), anyObject(AmbariManagementController.class), capture(configTypes), capture(configUpdates), anyObject(Collection.class), anyObject(String.class), anyObject(String.class)); expectLastCall().atLeastOnce(); @@ -163,8 +164,15 @@ public class UpdateKerberosConfigsServerActionTest extends EasyMockSupport{ action.setExecutionCommand(executionCommand); action.execute(null); - assertEquals(configTypes.getValue(), "cluster-env"); - assertEquals(configUpdates.getValue().get("security_enabled"), "false"); + assertTrue(configTypes.getValues().contains("cluster-env")); + boolean containsSecurityEnabled = false; + for(Map<String, String> properties: configUpdates.getValues()) { + if(properties.containsKey("security_enabled")) { + containsSecurityEnabled = true; + break; + } + } + assertTrue(containsSecurityEnabled); verifyAll(); }
