Repository navigation
Commit dd04e8e
File tree
- tests/functional/fixtures
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -78,10 +78,8 @@ Running integration tests | |||
| 78 | 78 | ------------------------- | |
| 79 | 79 | ||
| 80 | 80 | Integration tests run against a running gitlab instance, using a docker | |
| 81 | - container. You need to have docker and `docker compose | ||
| 82 | - <https://docs.docker.com/compose/install/>`_ | ||
| 83 | - installed on the test machine, and your user must have the correct permissions | ||
| 84 | - to talk to the docker daemon. | ||
| 81 | + container. You need to have docker installed on the test machine, and your user | ||
| 82 | + must have the correct permissions to talk to the docker daemon. | ||
| 85 | 83 | ||
| 86 | 84 | To run these tests: | |
| 87 | 85 | ||
@@ -106,7 +104,7 @@ up of the containers by running: | |||
| 106 | 104 | ||
| 107 | 105 | .. code-block:: bash | |
| 108 | 106 | ||
| 109 | - docker compose -f tests/functional/fixtures/docker-compose.yml -p pytest-python-gitlab down -v | ||
| 107 | + docker-compose -f tests/functional/fixtures/docker-compose.yml -p pytest-python-gitlab down -v | ||
| 110 | 108 | ||
| 111 | 109 | By default, the tests run against the latest version of the ``gitlab/gitlab-ce`` | |
| 112 | 110 | image. You can override both the image and tag by providing either the | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,3 +1,4 @@ | |||
| 1 | 1 | -r requirements.txt | |
| 2 | 2 | -r requirements-test.txt | |
| 3 | + docker-compose==1.29.2 | ||
| 3 | 4 | pytest-docker==1.0.1 | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,5 +3,5 @@ pytest==7.1.3 | |||
| 3 | 3 | pytest-console-scripts==1.3.1 | |
| 4 | 4 | pytest-cov==4.0.0 | |
| 5 | 5 | pytest-github-actions-annotate-failures==0.1.7 | |
| 6 | - PyYaml==6.0 | ||
| 6 | + PyYaml==5.4.1 | ||
| 7 | 7 | responses==0.21.0 | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,11 +5,6 @@ | |||
| 5 | 5 | import pytest | |
| 6 | 6 | ||
| 7 | 7 | ||
| 8 | - @pytest.fixture(scope="session") | ||
| 9 | - def docker_compose_command(): | ||
| 10 | - return "docker compose" | ||
| 11 | - | ||
| 12 | - | ||
| 13 | 8 | @pytest.fixture(scope="session") | |
| 14 | 9 | def docker_compose_project_name(): | |
| 15 | 10 | """Set a consistent project name to enable optional reuse of containers.""" | |
0 commit comments