You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/09/17 18:11:03 UTC
git commit: Upgrade Maven Surefire plugin to see if that help make
"unstable" build actually fail.
Updated Branches:
refs/heads/master a90743be7 -> d2cb48b8b
Upgrade Maven Surefire plugin to see if that help make "unstable" build actually fail.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/d2cb48b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/d2cb48b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/d2cb48b8
Branch: refs/heads/master
Commit: d2cb48b8b6bf47b1fc6db1b7449430766febc30a
Parents: a90743b
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Tue Sep 17 12:10:51 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Tue Sep 17 12:10:51 2013 -0400
----------------------------------------------------------------------
.../filter/rewrite/i18n/UrlRewriteMessages.java | 2 +-
.../api/UrlRewriteServletFilterTest.java | 67 +++++++------
gateway-test-utils/pom.xml | 5 +
.../apache/hadoop/test/log/NoOpAppender.java | 98 ++++++++++++++++++++
pom.xml | 2 +-
5 files changed, 143 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/d2cb48b8/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/i18n/UrlRewriteMessages.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/i18n/UrlRewriteMessages.java b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/i18n/UrlRewriteMessages.java
index 5111cd8..b23dff5 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/i18n/UrlRewriteMessages.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/i18n/UrlRewriteMessages.java
@@ -61,7 +61,7 @@ public interface UrlRewriteMessages {
@Message( level = MessageLevel.ERROR, text = "Failed to filter field name {0}: {1}" )
void failedToFilterFieldName( String fieldName, @StackTrace( level = MessageLevel.DEBUG ) Exception e );
- @Message( level = MessageLevel.ERROR, text = "Failed to function {0}: {1}" )
+ @Message( level = MessageLevel.ERROR, text = "Rewrite function {0} failed: {1}" )
void failedToInvokeRewriteFunction( String functionName, @StackTrace( level = MessageLevel.DEBUG ) Exception e );
@Message( level = MessageLevel.ERROR, text = "Failed to find values by parameter name {0}: {1}" )
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/d2cb48b8/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
index c1b535e..e5000c6 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
@@ -20,9 +20,11 @@ package org.apache.hadoop.gateway.filter.rewrite.api;
import com.jayway.jsonassert.JsonAssert;
import org.apache.hadoop.gateway.filter.AbstractGatewayFilter;
import org.apache.hadoop.gateway.util.urltemplate.Parser;
+import org.apache.hadoop.test.log.NoOpAppender;
import org.apache.hadoop.test.log.NoOpLogger;
import org.apache.hadoop.test.mock.MockInteraction;
import org.apache.hadoop.test.mock.MockServlet;
+import org.apache.log4j.Appender;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.testing.HttpTester;
@@ -46,6 +48,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.nio.charset.Charset;
import java.util.EnumSet;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
@@ -523,35 +526,41 @@ public class UrlRewriteServletFilterTest {
@Test
public void testRequestXmlBodyRewriteWithFilterInitParamForInvalidFilterConfig() throws Exception {
- Map<String,String> initParams = new HashMap<String,String>();
- initParams.put( "request.body", "test-filter-3" );
- setUp( initParams );
-
- String input = "<root url='http://mock-host:42/test-input-path-1'><url>http://mock-host:42/test-input-path-2</url></root>";
- String expect = "<root url='http://mock-host:42/test-input-path-2'><url>http://mock-host:42/test-input-path-2</url></root>";
-
- // Setup the server side request/response interaction.
- interaction.expect()
- .method( "PUT" )
- .requestUrl( "http://mock-host:42/test-output-path-1" )
- .contentType( "text/xml" )
- .characterEncoding( "UTF-8" )
- .content( expect, Charset.forName( "UTF-8" ) );
- interaction.respond()
- .status( 200 );
- interactions.add( interaction );
- request.setMethod( "PUT" );
- request.setURI( "/test-input-path" );
- request.setVersion( "HTTP/1.1" );
- request.setHeader( "Host", "mock-host:42" );
- request.setContentType( "text/xml; charset=UTF-8" );
- request.setContent( input );
-
- // Execute the request.
- response.parse( server.getResponses( request.generate() ) );
-
- // Test the results.
- assertThat( response.getStatus(), is( 500 ) );
+ Enumeration<Appender> realAppenders = NoOpAppender.setUp();
+ try {
+
+ Map<String,String> initParams = new HashMap<String,String>();
+ initParams.put( "request.body", "test-filter-3" );
+ setUp( initParams );
+
+ String input = "<root url='http://mock-host:42/test-input-path-1'><url>http://mock-host:42/test-input-path-2</url></root>";
+ String expect = "<root url='http://mock-host:42/test-input-path-2'><url>http://mock-host:42/test-input-path-2</url></root>";
+
+ // Setup the server side request/response interaction.
+ interaction.expect()
+ .method( "PUT" )
+ .requestUrl( "http://mock-host:42/test-output-path-1" )
+ .contentType( "text/xml" )
+ .characterEncoding( "UTF-8" )
+ .content( expect, Charset.forName( "UTF-8" ) );
+ interaction.respond()
+ .status( 200 );
+ interactions.add( interaction );
+ request.setMethod( "PUT" );
+ request.setURI( "/test-input-path" );
+ request.setVersion( "HTTP/1.1" );
+ request.setHeader( "Host", "mock-host:42" );
+ request.setContentType( "text/xml; charset=UTF-8" );
+ request.setContent( input );
+
+ // Execute the request.
+ response.parse( server.getResponses( request.generate() ) );
+
+ // Test the results.
+ assertThat( response.getStatus(), is( 500 ) );
+ } finally {
+ NoOpAppender.tearDown( realAppenders );
+ }
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/d2cb48b8/gateway-test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test-utils/pom.xml b/gateway-test-utils/pom.xml
index b251168..2a71c3c 100644
--- a/gateway-test-utils/pom.xml
+++ b/gateway-test-utils/pom.xml
@@ -75,6 +75,11 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/d2cb48b8/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/NoOpAppender.java
----------------------------------------------------------------------
diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/NoOpAppender.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/NoOpAppender.java
new file mode 100644
index 0000000..647f0e2
--- /dev/null
+++ b/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/NoOpAppender.java
@@ -0,0 +1,98 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.test.log;
+
+import org.apache.log4j.Appender;
+import org.apache.log4j.Layout;
+import org.apache.log4j.Logger;
+import org.apache.log4j.spi.ErrorHandler;
+import org.apache.log4j.spi.Filter;
+import org.apache.log4j.spi.LoggingEvent;
+
+import java.util.Enumeration;
+
+public class NoOpAppender implements Appender {
+
+ public static Enumeration<Appender> setUp() {
+ Enumeration<Appender> appenders = (Enumeration<Appender>)Logger.getRootLogger().getAllAppenders();
+ Logger.getRootLogger().removeAllAppenders();
+ Logger.getRootLogger().addAppender( new NoOpAppender() );
+ return appenders;
+ }
+
+ public static void tearDown( Enumeration<Appender> appenders ) {
+ if( appenders != null ) {
+ while( appenders.hasMoreElements() ) {
+ Logger.getRootLogger().addAppender( appenders.nextElement() );
+ }
+ }
+ }
+
+ @Override
+ public void addFilter( Filter newFilter ) {
+ }
+
+ @Override
+ public Filter getFilter() {
+ return null;
+ }
+
+ @Override
+ public void clearFilters() {
+ }
+
+ @Override
+ public void close() {
+ }
+
+ @Override
+ public void doAppend( LoggingEvent event ) {
+ }
+
+ @Override
+ public String getName() {
+ return this.getClass().getName();
+ }
+
+ @Override
+ public void setErrorHandler( ErrorHandler errorHandler ) {
+ }
+
+ @Override
+ public ErrorHandler getErrorHandler() {
+ return null;
+ }
+
+ @Override
+ public void setLayout( Layout layout ) {
+ }
+
+ @Override
+ public Layout getLayout() {
+ return null;
+ }
+
+ @Override
+ public void setName( String name ) {
+ }
+
+ @Override
+ public boolean requiresLayout() {
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/d2cb48b8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 607eadf..022b2d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.12.4</version>
+ <version>2.16</version>
<configuration>
<excludedGroups>
org.apache.hadoop.test.category.SlowTests,org.apache.hadoop.test.category.ManualTests,org.apache.hadoop.test.category.IntegrationTests