diff options
| author | Max Wittig <max.wittig95@gmail.com> | 2019-07-21 19:51:20 +0200 |
|---|---|---|
| committer | Max Wittig <max.wittig95@gmail.com> | 2019-07-21 20:20:15 +0200 |
| commit | 3b523f4c39ba4b3eacc9e76fcb22de7b426d2f45 (patch) | |
| tree | 3d34a0f2da92476980ea1583d5165fa0cbae14fd /tools | |
| parent | 8ff8af0d02327125fbfe1cfabe0a09f231e64788 (diff) | |
| download | gitlab-3b523f4c39ba4b3eacc9e76fcb22de7b426d2f45.tar.gz | |
test: minor test fixes
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build_test_env.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh index 624f879..da2136b 100755 --- a/tools/build_test_env.sh +++ b/tools/build_test_env.sh @@ -76,6 +76,7 @@ cleanup() { trap 'exit 1' HUP INT TERM } +try docker pull registry.gitlab.com/python-gitlab/python-gitlab:test >/dev/null try docker run --name gitlab-test --detach --publish 8080:80 \ --publish 2222:22 registry.gitlab.com/python-gitlab/python-gitlab:test >/dev/null @@ -99,7 +100,7 @@ if [ -z "$NOVENV" ]; then . "$VENV"/bin/activate || fatal "failed to activate Python virtual environment" log "Installing dependencies into virtualenv..." - try pip install -rrequirements.txt + try pip install -r requirements.txt log "Installing into virtualenv..." try pip install -e . @@ -126,7 +127,7 @@ TOKEN=$($(dirname $0)/generate_token.py) cat > $CONFIG << EOF [global] default = local -timeout = 10 +timeout = 30 [local] url = http://localhost:8080 @@ -138,6 +139,6 @@ log "Config file content ($CONFIG):" log <$CONFIG log "Pausing to give GitLab some time to finish starting up..." -sleep 60 +sleep 200 log "Test environment initialized." |