You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2017/01/27 12:07:39 UTC
[1/2] ambari git commit: AMBARI-19741. Ambari Server Unit Test
failure on branch-2.5/trunk for testUpdateConfigForceSecurityEnabled
(echekanskiy via dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 0987e5ee1 -> 31527a015
refs/heads/trunk 16c0b68e6 -> cc30798a6
AMBARI-19741. Ambari Server Unit Test failure on branch-2.5/trunk for testUpdateConfigForceSecurityEnabled (echekanskiy via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cc30798a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cc30798a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cc30798a
Branch: refs/heads/trunk
Commit: cc30798a6f1428fbe2a2dd6c64cac2c128cf9a23
Parents: 16c0b68
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Jan 27 14:06:49 2017 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Jan 27 14:06:49 2017 +0200
----------------------------------------------------------------------
.../UpdateKerberosConfigsServerActionTest.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cc30798a/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 e756491..c8ebb63 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;
@@ -43,7 +43,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -165,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();
}
[2/2] ambari git commit: pick e3e9ab0a6 gradle - use custom testng
suite AMBARI-19741. Ambari Server Unit Test failure on branch-2.5/trunk for
testUpdateConfigForceSecurityEnabled (echekanskiy via dlysnichenko)
Posted by dm...@apache.org.
pick e3e9ab0a6 gradle - use custom testng suite
AMBARI-19741. Ambari Server Unit Test failure on branch-2.5/trunk for testUpdateConfigForceSecurityEnabled (echekanskiy via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/31527a01
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/31527a01
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/31527a01
Branch: refs/heads/branch-2.5
Commit: 31527a01564d337986568e58d0d49122a5f952a4
Parents: 0987e5e
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Jan 27 14:07:23 2017 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Jan 27 14:07:23 2017 +0200
----------------------------------------------------------------------
.../UpdateKerberosConfigsServerActionTest.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/31527a01/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..710f474 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;
@@ -163,8 +163,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();
}