Repository: ambari Updated Branches: refs/heads/branch-2.5 3f19ca0c9 -> 687d701af
Revert "AMBARI-19741. Ambari Server Unit Test failure on branch-2.5/trunk for testUpdateConfigForceSecurityEnabled (echekanskiy via dlysnichenko)" This reverts commit 31527a01564d337986568e58d0d49122a5f952a4. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/687d701a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/687d701a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/687d701a Branch: refs/heads/branch-2.5 Commit: 687d701af60998743dd1d97ab62459e8630b18e7 Parents: 3f19ca0 Author: Robert Levas <rle...@hortonworks.com> Authored: Fri Jan 27 15:13:01 2017 -0500 Committer: Robert Levas <rle...@hortonworks.com> Committed: Fri Jan 27 15:13:01 2017 -0500 ---------------------------------------------------------------------- .../UpdateKerberosConfigsServerActionTest.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/687d701a/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 710f474..98b3f00 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.assertTrue; +import static org.junit.Assert.assertEquals; import java.io.File; import java.util.Collection; @@ -163,15 +163,8 @@ public class UpdateKerberosConfigsServerActionTest extends EasyMockSupport{ action.setExecutionCommand(executionCommand); action.execute(null); - 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); + assertEquals(configTypes.getValue(), "cluster-env"); + assertEquals(configUpdates.getValue().get("security_enabled"), "false"); verifyAll(); }
