Browse Source

Support different server ports - defined by EXECUTOR_NUMBER

remotes/origin/certificate-external-storage-visibility
Thomas Müller 10 years ago
parent
commit
e3a98e4959
  1. 4
      build/integration/config/behat.yml
  2. 6
      build/integration/features/bootstrap/FeatureContext.php
  3. 12
      build/integration/run.sh

4
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

6
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;
}
}
/**

12
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
Loading…
Cancel
Save