| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent 953f38d commit f825d70
3 files changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -78,8 +78,10 @@ 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 installed on the test machine, and your user | ||
| 82 | - must have the correct permissions to talk to the docker daemon. | ||
| 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. | ||
| 83 | 85 | ||
| 84 | 86 | To run these tests: | |
| 85 | 87 | ||
@@ -104,7 +106,7 @@ up of the containers by running: | |||
| 104 | 106 | ||
| 105 | 107 | .. code-block:: bash | |
| 106 | 108 | ||
| 107 | - docker-compose -f tests/functional/fixtures/docker-compose.yml -p pytest-python-gitlab down -v | ||
| 109 | + docker compose -f tests/functional/fixtures/docker-compose.yml -p pytest-python-gitlab down -v | ||
| 108 | 110 | ||
| 109 | 111 | By default, the tests run against the latest version of the ``gitlab/gitlab-ce`` | |
| 110 | 112 | image. You can override both the image and tag by providing either the | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,4 +1,3 @@ | |||
| 1 | 1 | -r requirements.txt | |
| 2 | 2 | -r requirements-test.txt | |
| 3 | - docker-compose==1.29.2 # prevent inconsistent .env behavior from system install | ||
| 4 | 3 | pytest-docker | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -34,6 +34,11 @@ def gitlab_version(gl) -> GitlabVersion: | |||
| 34 | 34 | return GitlabVersion(major=major, minor=minor, patch=patch, revision=revision) | |
| 35 | 35 | ||
| 36 | 36 | ||
| 37 | + @pytest.fixture(scope="session") | ||
| 38 | + def docker_compose_command(): | ||
| 39 | + return "docker compose" | ||
| 40 | + | ||
| 41 | + | ||
| 37 | 42 | @pytest.fixture(scope="session") | |
| 38 | 43 | def fixture_dir(test_dir) -> pathlib.Path: | |
| 39 | 44 | return test_dir / "functional" / "fixtures" | |
| Back | FazBrowse Home | New Git URL |
0 commit comments