diff options
| author | Nejc Habjan <nejc.habjan@siemens.com> | 2022-02-06 00:10:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-06 00:10:37 +0100 |
| commit | 4cb7d9224fb24e4a13fdff8271de5ce083ad7757 (patch) | |
| tree | 7f3d31db679b4739867ec7e60a44ecc0116017a0 | |
| parent | 5e1969431294bdb11b37b12c2b2ca3f20466389e (diff) | |
| parent | 5b7d00df466c0fe894bafeb720bf94ffc8cd38fd (diff) | |
| download | gitlab-4cb7d9224fb24e4a13fdff8271de5ce083ad7757.tar.gz | |
Merge pull request #1881 from python-gitlab/jlvillal/easy2
test(functional): fix GitLab configuration to support pagination
| -rw-r--r-- | tests/functional/api/test_gitlab.py | 4 | ||||
| -rw-r--r-- | tests/functional/api/test_projects.py | 2 | ||||
| -rw-r--r-- | tests/functional/fixtures/docker-compose.yml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/functional/api/test_gitlab.py b/tests/functional/api/test_gitlab.py index b071128..5c8cf85 100644 --- a/tests/functional/api/test_gitlab.py +++ b/tests/functional/api/test_gitlab.py @@ -81,13 +81,13 @@ def test_template_dockerfile(gl): def test_template_gitignore(gl): - assert gl.gitignores.list() + assert gl.gitignores.list(all=True) gitignore = gl.gitignores.get("Node") assert gitignore.content is not None def test_template_gitlabciyml(gl): - assert gl.gitlabciymls.list() + assert gl.gitlabciymls.list(all=True) gitlabciyml = gl.gitlabciymls.get("Nodejs") assert gitlabciyml.content is not None diff --git a/tests/functional/api/test_projects.py b/tests/functional/api/test_projects.py index a66e368..8f8abbe 100644 --- a/tests/functional/api/test_projects.py +++ b/tests/functional/api/test_projects.py @@ -244,7 +244,7 @@ def test_project_protected_branches(project): def test_project_remote_mirrors(project): - mirror_url = "http://gitlab.test/root/mirror.git" + mirror_url = "https://gitlab.example.com/root/mirror.git" mirror = project.remote_mirrors.create({"url": mirror_url}) assert mirror.url == mirror_url diff --git a/tests/functional/fixtures/docker-compose.yml b/tests/functional/fixtures/docker-compose.yml index e4869fb..ae1d776 100644 --- a/tests/functional/fixtures/docker-compose.yml +++ b/tests/functional/fixtures/docker-compose.yml @@ -14,7 +14,7 @@ services: GITLAB_ROOT_PASSWORD: 5iveL!fe GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN: registration-token GITLAB_OMNIBUS_CONFIG: | - external_url 'http://gitlab.test' + external_url 'http://127.0.0.1:8080' registry['enable'] = false nginx['redirect_http_to_https'] = false nginx['listen_port'] = 80 |