mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4477 from danxuliu/acceptance-macos-nitpicking 

Fix minor code style issues in acceptance test runner
This commit is contained in:
Roeland Jago Douma 2017-04-24 19:30:03 +02:00 committed by GitHub
parent 3551d38027 b0b32eff1f
commit 41f492ada7
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/acceptance/run.sh
View File

@ -48,31 +48,34 @@
# (probably you will not have containers nor images with those names, but just
# in case).
# Switch between timeout on linux and gtimeout on macOS (same for mktemp and
# gmktemp)
case "$OSTYPE" in
# Sets the variables that abstract the differences in command names and options
# between operating systems.
#
# Switches between timeout on GNU/Linux and gtimeout on macOS (same for mktemp
# and gmktemp).
function setOperatingSystemAbstractionVariables() {
case "$OSTYPE" in
darwin*)
INSTALLED=$(which gtimeout)
if [ "$INSTALLED" == "" ]; then
if [ "$(which gtimeout)" == "" ]; then
echo "Please install coreutils (brew install coreutils)"
exit 1;
exit 1
fi
MKTEMP=gmktemp
TIMEOUT=gtimeout
DOCKEROPTION="-e no_proxy=localhost "
DOCKER_OPTIONS="-e no_proxy=localhost "
;;
linux*)
MKTEMP=mktemp
TIMEOUT=timeout
DOCKEROPTION=" "
DOCKER_OPTIONS=" "
;;
*)
echo "Operating system ($OSTYPE) not supported"
exit 1
;;
esac
esac
}
# Launches the Selenium server in a Docker container.
#
@ -105,12 +108,12 @@ function prepareSelenium() {
SELENIUM_CONTAINER=selenium-nextcloud-local-test-acceptance
echo "Starting Selenium server"
docker run --detach --name=$SELENIUM_CONTAINER --publish 4444:4444 --publish 5900:5900 $DOCKEROPTION selenium/standalone-firefox-debug:2.53.1-beryllium
docker run --detach --name=$SELENIUM_CONTAINER --publish 4444:4444 --publish 5900:5900 $DOCKER_OPTIONS selenium/standalone-firefox-debug:2.53.1-beryllium
echo "Waiting for Selenium server to be ready"
if ! $TIMEOUT 10s bash -c "while ! curl 127.0.0.1:4444 >/dev/null 2>&1; do sleep 1; done"; then
echo "Could not start Selenium server; running" \
"\"docker run --rm --publish 4444:4444 --publish 5900:5900 $DOCKEROPTION selenium/standalone-firefox-debug:2.53.1-beryllium\"" \
"\"docker run --rm --publish 4444:4444 --publish 5900:5900 $DOCKER_OPTIONS selenium/standalone-firefox-debug:2.53.1-beryllium\"" \
"could give you a hint of the problem"
exit 1
@ -197,6 +200,8 @@ cd "$(dirname $0)"
# If no parameter is provided to this script all the acceptance tests are run.
SCENARIO_TO_RUN=$1
setOperatingSystemAbstractionVariables
prepareSelenium
prepareDocker