test: minor test fixes

max-wittig · max-wittig · commit ab0d7ddf8fca · 2019-07-21T19:51:20.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,13 +2,6 @@ sudo: required
 services:
   - docker
 language: python
-env:
-  #- TOX_ENV=py_func_v4
-  - TOX_ENV=cli_func_v4
-install:
-  - pip install tox
-script:
-  - tox -e $TOX_ENV
 
 git:
   depth: false
@@ -39,6 +32,13 @@ jobs:
       script:
         - pip3 install tox
         - tox -e cli_func_v4
+    - stage: test
+      name: py_func_v4
+      dist: bionic
+      python: 3.7
+      script:
+        - pip3 install tox
+        - tox -e py_func_v4
     - stage: test
       name: docs
       dist: bionic
diff --git 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."
diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py36,py35,py34,py27,pep8,black
+envlist = py38,py37,py36,py35,py34,py27,pep8,black
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
