diff options
| author | Nejc Habjan <hab.nejc@gmail.com> | 2021-11-28 02:07:18 +0100 |
|---|---|---|
| committer | Nejc Habjan <hab.nejc@gmail.com> | 2021-11-28 02:07:18 +0100 |
| commit | 381c748415396e0fe54bb1f41a3303bab89aa065 (patch) | |
| tree | bc281c9466090be764f0a953570bb6dd7f575d70 | |
| parent | 6b892e3dcb18d0f43da6020b08fd4ba891da3670 (diff) | |
| download | gitlab-381c748415396e0fe54bb1f41a3303bab89aa065.tar.gz | |
chore(tests): apply review suggestions
| -rw-r--r-- | requirements-test.txt | 2 | ||||
| -rw-r--r-- | tests/functional/conftest.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/requirements-test.txt b/requirements-test.txt index 7fd386d..9f9df61 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,6 +1,6 @@ coverage httmock pytest -pytest-console-scripts +pytest-console-scripts==1.2.1 pytest-cov responses diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py index 854a273..625cff9 100644 --- a/tests/functional/conftest.py +++ b/tests/functional/conftest.py @@ -31,8 +31,8 @@ def reset_gitlab(gl): user.delete(hard_delete=True) -def set_token(container, rootdir): - set_token_rb = rootdir / "set_token.rb" +def set_token(container, fixture_dir): + set_token_rb = fixture_dir / "set_token.rb" with open(set_token_rb, "r") as f: set_token_command = f.read().strip() @@ -137,7 +137,7 @@ def gitlab_config(check_is_alive, docker_ip, docker_services, temp_dir, fixture_ timeout=200, pause=5, check=lambda: check_is_alive("gitlab-test") ) - token = set_token("gitlab-test", rootdir=fixture_dir) + token = set_token("gitlab-test", fixture_dir=fixture_dir) config = f"""[global] default = local |