diff options
| author | Nejc Habjan <nejc.habjan@siemens.com> | 2022-09-23 23:39:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-23 23:39:09 +0200 |
| commit | fceeebc441d4d3a4c0443fd9dbfcb188fd4f910d (patch) | |
| tree | 7569cd58d926d53c98521be3dbcd424210b9beae | |
| parent | 86b0e4015a258433528de0a5b063defa3eeb3e26 (diff) | |
| parent | b87a2bc7cfacd3a3c4a18342c07b89356bf38d50 (diff) | |
| download | gitlab-fceeebc441d4d3a4c0443fd9dbfcb188fd4f910d.tar.gz | |
Merge pull request #2280 from python-gitlab/jlvillal/docker_image
chore: bump GitLab docker image to 15.4.0-ee.0
| -rw-r--r-- | tests/functional/api/test_gitlab.py | 2 | ||||
| -rw-r--r-- | tests/functional/conftest.py | 15 | ||||
| -rw-r--r-- | tests/functional/fixtures/.env | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/tests/functional/api/test_gitlab.py b/tests/functional/api/test_gitlab.py index f2bdf50..d81f4d8 100644 --- a/tests/functional/api/test_gitlab.py +++ b/tests/functional/api/test_gitlab.py @@ -59,7 +59,7 @@ def test_lint(gl): def test_sidekiq_queue_metrics(gl): out = gl.sidekiq.queue_metrics() assert isinstance(out, dict) - assert "pages" in out["queues"] + assert "default" in out["queues"] def test_sidekiq_process_metrics(gl): diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py index 9005605..3bd4fc5 100644 --- a/tests/functional/conftest.py +++ b/tests/functional/conftest.py @@ -68,11 +68,18 @@ def reset_gitlab(gl: gitlab.Gitlab) -> None: if is_gitlab_ee(gl): logging.info("GitLab EE detected") # NOTE(jlvillal): By default in GitLab EE it will wait 7 days before - # deleting a group. Change it to 0 days. + # deleting a group. Disable delayed group/project deletion. settings = gl.settings.get() - if settings.deletion_adjourned_period != 0: - logging.info("Setting deletion_adjourned_period to 0") - settings.deletion_adjourned_period = 0 + modified_settings = False + if settings.delayed_group_deletion: + logging.info("Setting `delayed_group_deletion` to False") + settings.delayed_group_deletion = False + modified_settings = True + if settings.delayed_project_deletion: + logging.info("Setting `delayed_project_deletion` to False") + settings.delayed_project_deletion = False + modified_settings = True + if modified_settings: settings.save() for project in gl.projects.list(): diff --git a/tests/functional/fixtures/.env b/tests/functional/fixtures/.env index 9be02fe..449bc84 100644 --- a/tests/functional/fixtures/.env +++ b/tests/functional/fixtures/.env @@ -1,2 +1,2 @@ GITLAB_IMAGE=gitlab/gitlab-ee -GITLAB_TAG=15.2.0-ee.0 +GITLAB_TAG=15.4.0-ee.0 |