Skip to content

Commit

Permalink
test(functional): fix GitLab configuration to support pagination
Browse files Browse the repository at this point in the history
When pagination occurs python-gitlab uses the URL provided by the
GitLab server to use for the next request.

We had previously set the GitLab server configuraiton to say its URL
was `http://gitlab.test` which is not in DNS. Set the hostname
in the URL to `http://127.0.0.1:8080` which is the correct URL for the
GitLab server to be accessed while doing functional tests.

Closes: #1877
  • Loading branch information
JohnVillalovos committed Feb 5, 2022
1 parent 5e19694 commit 5b7d00d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tests/functional/api/test_gitlab.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/functional/api/test_projects.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/fixtures/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5b7d00d

Please sign in to comment.