You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sv...@apache.org on 2016/11/21 13:57:37 UTC
incubator-atlas git commit: Tests SSLAndKerberosTest.testService and
SSLTest.testService are failing
Repository: incubator-atlas
Updated Branches:
refs/heads/master 1fa052643 -> 699498d70
Tests SSLAndKerberosTest.testService and SSLTest.testService are failing
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/699498d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/699498d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/699498d7
Branch: refs/heads/master
Commit: 699498d70efa0aedf3370abe44ffceffa41e7df6
Parents: 1fa0526
Author: svimal2106 <sv...@apache.org>
Authored: Mon Nov 21 19:10:37 2016 +0530
Committer: svimal2106 <sv...@apache.org>
Committed: Mon Nov 21 19:10:37 2016 +0530
----------------------------------------------------------------------
release-log.txt | 1 +
webapp/src/test/java/org/apache/atlas/web/TestUtils.java | 5 +++++
.../org/apache/atlas/web/security/SSLAndKerberosTest.java | 8 ++++++++
.../test/java/org/apache/atlas/web/security/SSLTest.java | 9 +++++++++
4 files changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/699498d7/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 0f9d5db..d665cb4 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al
ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
ALL CHANGES:
+ATLAS-1313 Tests SSLAndKerberosTest.testService and SSLTest.testService are failing (ayubkhan via svimal2106)
ATLAS-1116 Performance monitoring of backend methods in API requests (shwethags)
ATLAS-1310 attempt LDAP authentication only when enabled (mneethiraj)
ATLAS-1309 updated HBase model with addition of column-family and column entity-defs (mneethiraj)
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/699498d7/webapp/src/test/java/org/apache/atlas/web/TestUtils.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/atlas/web/TestUtils.java b/webapp/src/test/java/org/apache/atlas/web/TestUtils.java
index 47bea1f..e22a1c1 100644
--- a/webapp/src/test/java/org/apache/atlas/web/TestUtils.java
+++ b/webapp/src/test/java/org/apache/atlas/web/TestUtils.java
@@ -51,4 +51,9 @@ public class TestUtils {
return System.getProperty("projectBaseDir") + String.format("/webapp/target/atlas-webapp-%s",
System.getProperty("project.version"));
}
+
+ public static String getTargetDirectory() {
+ return System.getProperty("projectBaseDir") + "/webapp/target" ;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/699498d7/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java b/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java
index f96fa75..6823c83 100755
--- a/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java
+++ b/webapp/src/test/java/org/apache/atlas/web/security/SSLAndKerberosTest.java
@@ -57,6 +57,7 @@ public class SSLAndKerberosTest extends BaseSSLAndKerberosTest {
private TestSecureEmbeddedServer secureEmbeddedServer;
private Subject subject;
private String originalConf;
+ private String originalHomeDir;
@BeforeClass
public void setUp() throws Exception {
@@ -118,6 +119,9 @@ public class SSLAndKerberosTest extends BaseSSLAndKerberosTest {
originalConf = System.getProperty("atlas.conf");
System.setProperty("atlas.conf", persistDir);
+ originalHomeDir = System.getProperty("atlas.home");
+ System.setProperty("atlas.home", TestUtils.getTargetDirectory());
+
dgiCLient = proxyUser.doAs(new PrivilegedExceptionAction<AtlasClient>() {
@Override
public AtlasClient run() throws Exception {
@@ -148,6 +152,10 @@ public class SSLAndKerberosTest extends BaseSSLAndKerberosTest {
if (originalConf != null) {
System.setProperty("atlas.conf", originalConf);
}
+
+ if(originalHomeDir !=null){
+ System.setProperty("atlas.home", originalHomeDir);
+ }
}
protected Subject loginTestUser() throws LoginException, IOException {
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/699498d7/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java b/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java
index 07a5d20..95720fd 100755
--- a/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java
+++ b/webapp/src/test/java/org/apache/atlas/web/security/SSLTest.java
@@ -19,6 +19,7 @@
package org.apache.atlas.web.security;
import org.apache.atlas.AtlasClient;
+import org.apache.atlas.web.TestUtils;
import org.apache.atlas.web.service.SecureEmbeddedServer;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.hadoop.conf.Configuration;
@@ -46,6 +47,7 @@ public class SSLTest extends BaseSSLAndKerberosTest {
private String providerUrl;
private TestSecureEmbeddedServer secureEmbeddedServer;
private String originalConf;
+ private String originalHomeDir;
class TestSecureEmbeddedServer extends SecureEmbeddedServer {
@@ -79,6 +81,9 @@ public class SSLTest extends BaseSSLAndKerberosTest {
originalConf = System.getProperty("atlas.conf");
System.setProperty("atlas.conf", persistDir);
+ originalHomeDir = System.getProperty("atlas.home");
+ System.setProperty("atlas.home", TestUtils.getTargetDirectory());
+
atlasClient = new AtlasClient(configuration, new String[]{DGI_URL},new String[]{"admin","admin"});
secureEmbeddedServer = new TestSecureEmbeddedServer(21443, getWarPath()) {
@@ -99,6 +104,10 @@ public class SSLTest extends BaseSSLAndKerberosTest {
if (originalConf != null) {
System.setProperty("atlas.conf", originalConf);
}
+
+ if(originalHomeDir !=null){
+ System.setProperty("atlas.home", originalHomeDir);
+ }
}
protected void setupCredentials() throws Exception {