From 497f56c3e1b276fb9499833da0cebfb3b756d03b Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Sun, 21 Jul 2019 19:00:48 +0200 Subject: [PATCH 1/3] test: increase speed by disabling the rate limit faster --- tools/python_test_v4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/python_test_v4.py b/tools/python_test_v4.py index 61fcd4353..d0689dcbb 100644 --- a/tools/python_test_v4.py +++ b/tools/python_test_v4.py @@ -843,9 +843,9 @@ error_message = e.error_message break assert "Retry later" in error_message -[current_project.delete() for current_project in projects] settings.throttle_authenticated_api_enabled = False settings.save() +[current_project.delete() for current_project in projects] # project import/export ex = admin_project.exports.create({}) From 8ff8af0d02327125fbfe1cfabe0a09f231e64788 Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Sun, 21 Jul 2019 19:08:35 +0200 Subject: [PATCH 2/3] test: add project releases test Fixes #762 --- tools/python_test_v4.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tools/python_test_v4.py b/tools/python_test_v4.py index d0689dcbb..d65f39f5d 100644 --- a/tools/python_test_v4.py +++ b/tools/python_test_v4.py @@ -871,3 +871,31 @@ count += 1 if count == 10: raise Exception("Project import taking too much time") + +# project releases +release_test_project = gl.projects.create( + {"name": "release-test-project", "initialize_with_readme": True} +) +release_name = "Demo Release" +release_tag_name = "v1.2.3" +release_description = "release notes go here" +release_test_project.releases.create( + { + "name": release_name, + "tag_name": release_tag_name, + "description": release_description, + "ref": "master", + } +) +assert len(release_test_project.releases.list()) == 1 + +# get single release +retrieved_project = release_test_project.releases.get(release_tag_name) +assert retrieved_project.name == release_name +assert retrieved_project.tag_name == release_tag_name +assert retrieved_project.description == release_description + +# delete release +release_test_project.releases.delete(release_tag_name) +assert len(release_test_project.releases.list()) == 0 +release_test_project.delete() From 3b523f4c39ba4b3eacc9e76fcb22de7b426d2f45 Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Sun, 21 Jul 2019 19:51:20 +0200 Subject: [PATCH 3/3] test: minor test fixes --- .travis.yml | 14 +++++++------- tools/build_test_env.sh | 7 ++++--- tox.ini | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18ded190e..be7fdf4b6 100644 --- 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 index 624f87908..da2136b7a 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." diff --git a/tox.ini b/tox.ini index ac34542a1..db28f6ea8 100644 --- 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}