diff options
| author | Max Wittig <max.wittig@siemens.com> | 2020-09-16 09:33:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-16 09:33:41 +0200 |
| commit | 266030a67480aaf305069e8fea15b1528fa99d31 (patch) | |
| tree | 17c9ddcad555ce5f20dd68d99a86dda9181b5d66 /tools/functional/cli/conftest.py | |
| parent | 0d89a6e61bd4ae244c1545463272ef830d72dda9 (diff) | |
| parent | 40ec2f528b885290fbb3e2d7ef0f5f8615219326 (diff) | |
| download | gitlab-266030a67480aaf305069e8fea15b1528fa99d31.tar.gz | |
Merge pull request #1178 from python-gitlab/test/cleanup-env
test(env): replace custom scripts with pytest and docker-compose
Diffstat (limited to 'tools/functional/cli/conftest.py')
| -rw-r--r-- | tools/functional/cli/conftest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/functional/cli/conftest.py b/tools/functional/cli/conftest.py index 13c3096..ba94dcb 100644 --- a/tools/functional/cli/conftest.py +++ b/tools/functional/cli/conftest.py @@ -2,7 +2,7 @@ import pytest @pytest.fixture -def gitlab_cli(script_runner, CONFIG): +def gitlab_cli(script_runner, gitlab_config): """Wrapper fixture to help make test cases less verbose.""" def _gitlab_cli(subcommands): @@ -10,7 +10,7 @@ def gitlab_cli(script_runner, CONFIG): Return a script_runner.run method that takes a default gitlab command, and subcommands passed as arguments inside test cases. """ - command = ["gitlab", "--config-file", CONFIG] + command = ["gitlab", "--config-file", gitlab_config] for subcommand in subcommands: # ensure we get strings (e.g from IDs) |