You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ve...@apache.org on 2014/09/16 02:15:48 UTC
git commit: FALCON-728 Unit test failures on jenkins. Contributed by
Sowmya Ramesh
Repository: incubator-falcon
Updated Branches:
refs/heads/master 864b4b0c2 -> d999cf27b
FALCON-728 Unit test failures on jenkins. Contributed by Sowmya Ramesh
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/d999cf27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/d999cf27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/d999cf27
Branch: refs/heads/master
Commit: d999cf27bda08ee52f7da4d7073528c35b434cfa
Parents: 864b4b0
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Mon Sep 15 16:14:34 2014 -0700
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Mon Sep 15 16:14:34 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../test/java/org/apache/falcon/entity/AbstractTestBase.java | 8 ++------
.../falcon/security/FalconAuthenticationFilterTest.java | 3 +++
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/d999cf27/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 56ec399..6f7dad7 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -89,6 +89,8 @@ Trunk (Unreleased)
OPTIMIZATIONS
BUG FIXES
+ FALCON-728 Unit test failures on jenkins (Sowmya Ramesh via Venkatesh Seetharam)
+
FALCON-727 JQuery license is incorrectly mentioned in the header file. (Srikanth Sundarrajan)
FALCON-702 JailedFileSystem does not work for relative paths
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/d999cf27/common/src/test/java/org/apache/falcon/entity/AbstractTestBase.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/falcon/entity/AbstractTestBase.java b/common/src/test/java/org/apache/falcon/entity/AbstractTestBase.java
index c35d1a4..2140335 100644
--- a/common/src/test/java/org/apache/falcon/entity/AbstractTestBase.java
+++ b/common/src/test/java/org/apache/falcon/entity/AbstractTestBase.java
@@ -143,14 +143,10 @@ public class AbstractTestBase {
return stringWriter.toString();
}
-
+ // assumes there will always be at least one group for a logged in user
protected String getGroupName() throws IOException {
- return getGroupName(true);
- }
-
- protected String getGroupName(boolean first) throws IOException {
String[] groupNames = CurrentUser.getProxyUgi().getGroupNames();
System.out.println("groupNames = " + Arrays.asList(groupNames));
- return groupNames.length > 1 ? groupNames[first ? 0 : groupNames.length - 1] : "admin";
+ return groupNames[0];
}
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/d999cf27/prism/src/test/java/org/apache/falcon/security/FalconAuthenticationFilterTest.java
----------------------------------------------------------------------
diff --git a/prism/src/test/java/org/apache/falcon/security/FalconAuthenticationFilterTest.java b/prism/src/test/java/org/apache/falcon/security/FalconAuthenticationFilterTest.java
index 787e528..4ceca29 100644
--- a/prism/src/test/java/org/apache/falcon/security/FalconAuthenticationFilterTest.java
+++ b/prism/src/test/java/org/apache/falcon/security/FalconAuthenticationFilterTest.java
@@ -33,6 +33,7 @@ import org.testng.annotations.Test;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
@@ -71,7 +72,9 @@ public class FalconAuthenticationFilterTest {
conf.put("type", "simple");
conf.put("config.prefix.type", "");
conf.put("anonymous.allowed", "true");
+ ServletContext servletContext = Mockito.mock(ServletContext.class);
Mockito.when(mockConfig.getInitParameterNames()).thenReturn(conf.keys());
+ Mockito.when(mockConfig.getServletContext()).thenReturn(servletContext);
for (Map.Entry<String, String> entry : conf.entrySet()) {
Mockito.when(mockConfig.getInitParameter(entry.getKey())).thenReturn(entry.getValue());