From e3a98e4959c36432b1e8250afc03708e10a32cca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 29 Sep 2015 13:56:56 +0200
Subject: [PATCH] Support different server ports - defined by EXECUTOR_NUMBER

---
 build/integration/config/behat.yml                   |  4 ++--
 .../features/bootstrap/FeatureContext.php            |  6 ++++++
 build/integration/run.sh                             | 12 ++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/build/integration/config/behat.yml b/build/integration/config/behat.yml
index 78a228a5c1..01ca0d1879 100644
--- a/build/integration/config/behat.yml
+++ b/build/integration/config/behat.yml
@@ -12,6 +12,6 @@ default:
 
 ci:
     formatter:
-        name:       junit
+        name:       pretty,junit
         parameters:
-          output_path: ./output
+          output_path: null,./output
diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index 527e0c9ba0..b7a04e1ca7 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -34,6 +34,12 @@ class FeatureContext extends BehatContext {
 		// Initialize your context here
 		$this->baseUrl = $parameters['baseUrl'];
 		$this->adminUser = $parameters['admin'];
+
+		// in case of ci deployment we take the server url from the environment
+		$testServerUrl = getenv('TEST_SERVER_URL');
+		if ($testServerUrl !== false) {
+			$this->baseUrl = $testServerUrl;
+		}
 	}
 
 	/**
diff --git a/build/integration/run.sh b/build/integration/run.sh
index df33d85fc7..08f10b86c5 100755
--- a/build/integration/run.sh
+++ b/build/integration/run.sh
@@ -3,17 +3,17 @@
 composer install
 
 # TODO: avoid port collision on jenkins - use $EXECUTOR_NUMBER
-#if [ -z "$EXECUTOR_NUMBER" ]; then
-#    EXECUTOR_NUMBER=0
-#fi
-#PORT=$((8080 + $EXECUTOR_NUMBER))
-PORT=8080
+if [ -z "$EXECUTOR_NUMBER" ]; then
+    EXECUTOR_NUMBER=0
+fi
+PORT=$((8080 + $EXECUTOR_NUMBER))
+#PORT=8080
 echo $PORT
 php -S localhost:$PORT -t ../.. &
 PHPPID=$!
 echo $PHPPID
 
-#export BEHAT_PARAMS="context[parameters][base_url]=http://localhost:$PORT/ocs"
+export TEST_SERVER_URL="http://localhost:$PORT/ocs/"
 vendor/bin/behat --profile ci
 
 kill $PHPPID