Added HAProxy 1.7 and PHP 7.1 functional tests

kamermans · Feb 13, 2017 · 79469cf · 79469cf
1 parent 7ceef77
commit 79469cf
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/tests/resources/haproxy-1.7.cfg b/tests/resources/haproxy-1.7.cfg
@@ -0,0 +1,25 @@
+global
+    node        haproxyapi-integration-test
+    stats       socket /tmp/haproxy-stats   user root group root mode 700 level admin
+    user        www-data
+    group       www-data
+
+defaults
+    mode http
+    timeout connect 100ms
+    timeout client 100ms
+    timeout server 100ms
+
+frontend unit-testing
+    bind *:80
+    default_backend local-backend
+
+backend local-backend
+    server      server1 127.0.0.1:8080
+
+listen stats
+    bind        *:10010
+    stats       enable
+    stats       auth testuser:testpass
+    stats       admin if TRUE
+    stats       uri /stats
diff --git a/tests/resources/run_functional_tests.sh b/tests/resources/run_functional_tests.sh
@@ -1,8 +1,8 @@
 #!/bin/sh -e
 
 DIR="$( cd "$( dirname "$0" )" && pwd )"
-HAPROXY_VERSIONS="1.4 1.5 1.6"
-PHP_VERSIONS="php:5.6-cli php:7.0-cli diegomarangoni/hhvm:cli"
+HAPROXY_VERSIONS="1.4 1.5 1.6 1.7"
+PHP_VERSIONS="php:5.6-cli php:7.0-cli php:7.1-cli diegomarangoni/hhvm:cli"
 
 kill_and_remove() {
     CONTAINER="$1"