Repository: incubator-atlas Updated Branches: refs/heads/master 46f539e15 -> 22650d6eb
ATLAS-1427: update tests for the changes in default SSL protocols support Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/22650d6e Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/22650d6e Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/22650d6e Branch: refs/heads/master Commit: 22650d6eb49d3ffb0c33dd1d7d63b4c22c680ff7 Parents: 46f539e Author: Madhan Neethiraj <[email protected]> Authored: Sun Jan 8 23:26:32 2017 -0800 Committer: Madhan Neethiraj <[email protected]> Committed: Sun Jan 8 23:26:32 2017 -0800 ---------------------------------------------------------------------- .../org/apache/atlas/web/security/BaseSSLAndKerberosTest.java | 4 ++++ .../apache/atlas/web/service/SecureEmbeddedServerTestBase.java | 1 + 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/22650d6e/webapp/src/test/java/org/apache/atlas/web/security/BaseSSLAndKerberosTest.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/security/BaseSSLAndKerberosTest.java b/webapp/src/test/java/org/apache/atlas/web/security/BaseSSLAndKerberosTest.java index fdadc2e..d46aa2f 100644 --- a/webapp/src/test/java/org/apache/atlas/web/security/BaseSSLAndKerberosTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/security/BaseSSLAndKerberosTest.java @@ -42,6 +42,10 @@ public class BaseSSLAndKerberosTest extends BaseSecurityTest { protected File httpKeytabFile; protected File userKeytabFile; + protected BaseSSLAndKerberosTest() { + System.setProperty("https.protocols", "TLSv1.2"); + } + class TestSecureEmbeddedServer extends SecureEmbeddedServer { public TestSecureEmbeddedServer(int port, String path) throws IOException { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/22650d6e/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java b/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java index 1ca8147..5d4ca97 100755 --- a/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java +++ b/webapp/src/test/java/org/apache/atlas/web/service/SecureEmbeddedServerTestBase.java @@ -75,6 +75,7 @@ public class SecureEmbeddedServerTestBase { System.setProperty("javax.net.ssl.trustStore", DEFAULT_KEYSTORE_FILE_LOCATION); System.setProperty("javax.net.ssl.trustStorePassword", "keypass"); System.setProperty("javax.net.ssl.trustStoreType", "JKS"); + System.setProperty("https.protocols", "TLSv1.2"); } @BeforeClass
