From a1c1129b53cc4e9ad4b23d2d0a298cf79ee03e33 Mon Sep 17 00:00:00 2001
From: Ka-Hing Cheung <khc@hxbc.us>
Date: Wed, 24 Jun 2015 18:26:36 -0700
Subject: [PATCH] run all tests in parallel

need to strip expect headers from jclouds to workaround an issue,
which maybe https://issues.apache.org/jira/browse/JCLOUDS-905
---
 pom.xml                                                    | 3 ++-
 src/main/java/org/gaul/s3proxy/S3Proxy.java                | 2 ++
 src/test/java/org/gaul/s3proxy/JcloudsIntegrationTest.java | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a109274..8fe66a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,11 +170,12 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.18.1</version>
         <configuration>
-          <parallel>classes</parallel>
+          <parallel>all</parallel>
           <threadCount>1</threadCount>
           <argLine>-Xmx256m</argLine>
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
           <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+          <runOrder>random</runOrder>
         </configuration>
       </plugin>
       <plugin>
diff --git a/src/main/java/org/gaul/s3proxy/S3Proxy.java b/src/main/java/org/gaul/s3proxy/S3Proxy.java
index 2816834..5e08055 100644
--- a/src/main/java/org/gaul/s3proxy/S3Proxy.java
+++ b/src/main/java/org/gaul/s3proxy/S3Proxy.java
@@ -29,6 +29,7 @@ import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.jclouds.blobstore.BlobStore;
 
 /**
@@ -73,6 +74,7 @@ public final class S3Proxy {
                 "Must provide both identity and credential");
 
         server = new Server();
+        ((QueuedThreadPool) server.getThreadPool()).setName("S3Proxy");
         HttpConnectionFactory httpConnectionFactory =
                 new HttpConnectionFactory();
         ServerConnector connector;
diff --git a/src/test/java/org/gaul/s3proxy/JcloudsIntegrationTest.java b/src/test/java/org/gaul/s3proxy/JcloudsIntegrationTest.java
index f123fba..d8f0580 100644
--- a/src/test/java/org/gaul/s3proxy/JcloudsIntegrationTest.java
+++ b/src/test/java/org/gaul/s3proxy/JcloudsIntegrationTest.java
@@ -80,6 +80,7 @@ public final class JcloudsIntegrationTest extends S3BlobIntegrationLiveTest {
                 info.getS3Credential());
         props.setProperty(Constants.PROPERTY_ENDPOINT,
                 info.getEndpoint().toString());
+        props.setProperty(Constants.PROPERTY_STRIP_EXPECT_HEADER, "true");
         return props;
     }
 }