diff options
| -rwxr-xr-x | tools/build_test_env.sh | 73 | ||||
| -rwxr-xr-x | tools/functional_tests.sh | 67 |
2 files changed, 82 insertions, 58 deletions
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh new file mode 100755 index 0000000..bbea547 --- /dev/null +++ b/tools/build_test_env.sh @@ -0,0 +1,73 @@ +#!/bin/bash +# Copyright (C) 2016 Gauvain Pocentek <gauvain@pocentek.net> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +PY_VER=2 +while getopts :p: opt "$@"; do + case $opt in + p) + PY_VER=$OPTARG;; + *) + echo "Unknown option: $opt" + exit 1;; + esac +done + +case $PY_VER in + 2) VENV_CMD=virtualenv;; + 3) VENV_CMD=pyvenv;; + *) + echo "Wrong python version (2 or 3)" + exit 1;; +esac + +docker run --name gitlab-test --detach --publish 8080:80 --publish 2222:22 genezys/gitlab:latest >/dev/null 2>&1 + +LOGIN='root' +PASSWORD='5iveL!fe' +CONFIG=/tmp/python-gitlab.cfg +GREEN='\033[0;32m' +NC='\033[0m' +OK="echo -e ${GREEN}OK${NC}" + +echo -n "Waiting for gitlab to come online... " +I=0 +while :; do + sleep 5 + curl -s http://localhost:8080/users/sign_in 2>/dev/null | grep -q "GitLab Community Edition" && break + let I=I+5 + [ $I -eq 120 ] && exit 1 +done +sleep 5 +$OK + +# Get the token +TOKEN=$(curl -s http://localhost:8080/api/v3/session \ + -X POST \ + --data "login=$LOGIN&password=$PASSWORD" \ + | python -c 'import sys, json; print(json.load(sys.stdin)["private_token"])') + +cat > $CONFIG << EOF +[global] +default = local +timeout = 2 + +[local] +url = http://localhost:8080 +private_token = $TOKEN +EOF + +echo "Config file content ($CONFIG):" +cat $CONFIG diff --git a/tools/functional_tests.sh b/tools/functional_tests.sh index 6ea0b44..d1e8bbe 100755 --- a/tools/functional_tests.sh +++ b/tools/functional_tests.sh @@ -23,31 +23,16 @@ cleanup() { } trap cleanup EXIT -PY_VER=2 -while getopts :p: opt "$@"; do - case $opt in - p) - PY_VER=$OPTARG;; - *) - echo "Unknown option: $opt" - exit 1;; - esac -done - -case $PY_VER in - 2) VENV_CMD=virtualenv;; - 3) VENV_CMD=pyvenv;; - *) - echo "Wrong python version (2 or 3)" - exit 1;; -esac - -docker run --name gitlab-test --detach --publish 8080:80 --publish 2222:22 genezys/gitlab:latest >/dev/null 2>&1 - -LOGIN='root' -PASSWORD='5iveL!fe' +setenv_script=$(dirname $0)/build_test_env.sh + +. $setenv_script "$@" + CONFIG=/tmp/python-gitlab.cfg GITLAB="gitlab --config-file $CONFIG" +GREEN='\033[0;32m' +NC='\033[0m' +OK="echo -e ${GREEN}OK${NC}" + VENV=$(pwd)/.venv $VENV_CMD $VENV @@ -55,42 +40,8 @@ $VENV_CMD $VENV pip install -rrequirements.txt pip install -e . -GREEN='\033[0;32m' -NC='\033[0m' -OK="echo -e ${GREEN}OK${NC}" - -echo -n "Waiting for gitlab to come online... " -I=0 -while :; do - sleep 5 - curl -s http://localhost:8080/users/sign_in 2>/dev/null | grep -q "GitLab Community Edition" && break - let I=I+5 - [ $I -eq 120 ] && exit 1 -done -sleep 5 -$OK - -# Get the token -TOKEN=$(curl -s http://localhost:8080/api/v3/session \ - -X POST \ - --data "login=$LOGIN&password=$PASSWORD" \ - | python -c 'import sys, json; print(json.load(sys.stdin)["private_token"])') - -cat > $CONFIG << EOF -[global] -default = local -timeout = 2 - -[local] -url = http://localhost:8080 -private_token = $TOKEN -EOF - -echo "Config file content ($CONFIG):" -cat $CONFIG - # NOTE(gpocentek): the first call might fail without a little delay -sleep 10 +sleep 5 set -e |