Repository: incubator-atlas Updated Branches: refs/heads/0.7-incubating d653777ef -> c71169da9
ATLAS-1427: update tests for the changes in default SSL protocols support (cherry picked from commit 22650d6eb49d3ffb0c33dd1d7d63b4c22c680ff7) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/c71169da Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/c71169da Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/c71169da Branch: refs/heads/0.7-incubating Commit: c71169da9d766cca7a08b411876578b48cabdaae Parents: d653777 Author: Madhan Neethiraj <[email protected]> Authored: Sun Jan 8 23:26:32 2017 -0800 Committer: Madhan Neethiraj <[email protected]> Committed: Tue Jan 10 12:52:41 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/c71169da/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/c71169da/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 455f121..a625019 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 @@ -78,6 +78,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
