Merge fe3f269 into b2c49e9

cjstehno · Jun 15, 2017 · 51a8036 · 51a8036
2 parents b2c49e9 + fe3f269
commit 51a8036
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,12 @@ language: java
 install: true
 jdk: oraclejdk8
 env:
-  matrix:
   - TERM=dumb
+  # list of compatible versions
+  - UNDERTOW_VERSION=1.3.15.Final
+  - UNDERTOW_VERSION=1.4.6.Final
 before_script:
   - ./gradlew --version
 script: ./gradlew build
 after_success:
-  - ./gradlew jacocoTestReport coveralls
+  - ./gradlew jacocoTestReport coveralls
diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ configurations {
 
 dependencies {
     compile 'org.codehaus.groovy:groovy-all:2.4.8'
-    compile 'io.undertow:undertow-core:1.4.6.Final'
+    compile "io.undertow:undertow-core:${System.getenv('UNDERTOW_VERSION') ?: '1.4.6.Final'}"
 
     compile 'ch.qos.logback:logback-classic:1.1.7'
 

diff --git a/src/main/groovy/com/stehno/ersatz/ErsatzServer.groovy b/src/main/groovy/com/stehno/ersatz/ErsatzServer.groovy
@@ -282,10 +282,12 @@ class ErsatzServer implements ServerConfig {
      */
     void start() {
         if (!started) {
-            Undertow.Builder builder = Undertow.builder().addHttpListener(EPHEMERAL_PORT, LOCALHOST)
+            actualHttpPort = generateRandomPort()
+            Undertow.Builder builder = Undertow.builder().addHttpListener(actualHttpPort, LOCALHOST)
 
             if (httpsEnabled) {
-                builder.addHttpsListener(EPHEMERAL_PORT, LOCALHOST, sslContext())
+                actualHttpsPort = generateRandomPort()
+                builder.addHttpsListener(actualHttpsPort, LOCALHOST, sslContext())
             }
 
             BlockingHandler blockingHandler = new BlockingHandler(new EncodingHandler(
@@ -317,12 +319,6 @@ class ErsatzServer implements ServerConfig {
 
             server.start()
 
-            actualHttpPort = (server.listenerInfo[0].address as InetSocketAddress).port
-
-            if (httpsEnabled) {
-                actualHttpsPort = (server.listenerInfo[1].address as InetSocketAddress).port
-            }
-
             started = true
         }
     }
@@ -392,6 +388,16 @@ class ErsatzServer implements ServerConfig {
         exchange.responseSender.send(responseContent)
     }
 
+    private static int generateRandomPort() {
+        ServerSocket httpTestSocket = null
+        try {
+            httpTestSocket = new ServerSocket(EPHEMERAL_PORT)
+            return httpTestSocket.getLocalPort()
+        } finally {
+            httpTestSocket?.close()
+        }
+    }
+
     @CompileStatic(TypeCheckingMode.SKIP)
     private SSLContext sslContext() {
         KeyStore keyStore = KeyStore.getInstance('JKS')