diff options
author | John L. Villalovos <john@sodarock.com> | 2021-11-25 13:03:20 -0800 |
---|---|---|
committer | John L. Villalovos <john@sodarock.com> | 2021-11-25 15:29:09 -0800 |
commit | 05ea611cd63321965e8c5cb29776f443d0ea34eb (patch) | |
tree | bc65bed9d6c9d0760b193eb35d6b2401c9d755a9 | |
parent | 3225f2cfee740374ef36e5cd6796d2370d0e2344 (diff) | |
download | gitlab-jlvillal/pytest_script_launch_mode.tar.gz |
chore: remove pytest-console-scripts specific configjlvillal/pytest_script_launch_mode
Remove the pytest-console-scripts specific config from the global
'[pytest]' config section.
Make the configuration be a per-module setting in each of the three
files that use the pytest-console-scripts plugin.
Closes #1713
-rw-r--r-- | tests/functional/cli/test_cli_packages.py | 3 | ||||
-rw-r--r-- | tests/functional/cli/test_cli_v4.py | 4 | ||||
-rw-r--r-- | tests/functional/cli/test_cli_variables.py | 5 | ||||
-rw-r--r-- | tox.ini | 3 |
4 files changed, 12 insertions, 3 deletions
diff --git a/tests/functional/cli/test_cli_packages.py b/tests/functional/cli/test_cli_packages.py index d7cdd18..a0716dc 100644 --- a/tests/functional/cli/test_cli_packages.py +++ b/tests/functional/cli/test_cli_packages.py @@ -1,7 +1,10 @@ +import pytest + package_name = "hello-world" package_version = "v1.0.0" file_name = "hello.tar.gz" file_content = "package content" +pytestmark = pytest.mark.script_launch_mode("subprocess") def test_list_project_packages(gitlab_cli, project): diff --git a/tests/functional/cli/test_cli_v4.py b/tests/functional/cli/test_cli_v4.py index 91c0afa..e220996 100644 --- a/tests/functional/cli/test_cli_v4.py +++ b/tests/functional/cli/test_cli_v4.py @@ -1,6 +1,10 @@ import os import time +import pytest + +pytestmark = pytest.mark.script_launch_mode("subprocess") + def test_create_project(gitlab_cli): name = "test-project1" diff --git a/tests/functional/cli/test_cli_variables.py b/tests/functional/cli/test_cli_variables.py index 9b1b16d..5013856 100644 --- a/tests/functional/cli/test_cli_variables.py +++ b/tests/functional/cli/test_cli_variables.py @@ -1,3 +1,8 @@ +import pytest + +pytestmark = pytest.mark.script_launch_mode("subprocess") + + def test_list_instance_variables(gitlab_cli, gl): cmd = ["variable", "list"] ret = gitlab_cli(cmd) @@ -84,9 +84,6 @@ exclude_lines = if TYPE_CHECKING: if debug: -[pytest] -script_launch_mode = subprocess - [testenv:cli_func_v4] deps = -r{toxinidir}/requirements-docker.txt commands = |