From 502715d99e02105c39b2c5cf0e7457b3256eba0d Mon Sep 17 00:00:00 2001 From: "John L. Villalovos" Date: Tue, 25 May 2021 17:35:17 -0700 Subject: [PATCH] chore: rename 'tools/functional/' to 'tests/functional/' Rename the 'tools/functional/' directory to 'tests/functional/' This makes more sense as these are functional tests and not tools. This was dicussed in: https://github.com/python-gitlab/python-gitlab/discussions/1468 --- .renovaterc.json | 2 +- MANIFEST.in | 2 +- {tools => tests}/functional/api/test_clusters.py | 0 .../functional/api/test_current_user.py | 0 {tools => tests}/functional/api/test_deploy_keys.py | 0 .../functional/api/test_deploy_tokens.py | 0 {tools => tests}/functional/api/test_gitlab.py | 0 {tools => tests}/functional/api/test_groups.py | 0 .../functional/api/test_import_export.py | 0 {tools => tests}/functional/api/test_issues.py | 0 .../functional/api/test_merge_requests.py | 0 {tools => tests}/functional/api/test_packages.py | 0 {tools => tests}/functional/api/test_projects.py | 0 {tools => tests}/functional/api/test_releases.py | 0 {tools => tests}/functional/api/test_repository.py | 0 {tools => tests}/functional/api/test_snippets.py | 0 {tools => tests}/functional/api/test_users.py | 0 {tools => tests}/functional/api/test_variables.py | 0 {tools => tests}/functional/cli/conftest.py | 0 .../functional/cli/test_cli_artifacts.py | 0 .../functional/cli/test_cli_packages.py | 0 {tools => tests}/functional/cli/test_cli_v4.py | 0 .../functional/cli/test_cli_variables.py | 0 {tools => tests}/functional/conftest.py | 2 +- {tools => tests}/functional/ee-test.py | 0 {tools => tests}/functional/fixtures/.env | 0 {tools => tests}/functional/fixtures/avatar.png | Bin .../functional/fixtures/docker-compose.yml | 0 {tools => tests}/functional/fixtures/set_token.rb | 0 tox.ini | 4 ++-- 30 files changed, 5 insertions(+), 5 deletions(-) rename {tools => tests}/functional/api/test_clusters.py (100%) rename {tools => tests}/functional/api/test_current_user.py (100%) rename {tools => tests}/functional/api/test_deploy_keys.py (100%) rename {tools => tests}/functional/api/test_deploy_tokens.py (100%) rename {tools => tests}/functional/api/test_gitlab.py (100%) rename {tools => tests}/functional/api/test_groups.py (100%) rename {tools => tests}/functional/api/test_import_export.py (100%) rename {tools => tests}/functional/api/test_issues.py (100%) rename {tools => tests}/functional/api/test_merge_requests.py (100%) rename {tools => tests}/functional/api/test_packages.py (100%) rename {tools => tests}/functional/api/test_projects.py (100%) rename {tools => tests}/functional/api/test_releases.py (100%) rename {tools => tests}/functional/api/test_repository.py (100%) rename {tools => tests}/functional/api/test_snippets.py (100%) rename {tools => tests}/functional/api/test_users.py (100%) rename {tools => tests}/functional/api/test_variables.py (100%) rename {tools => tests}/functional/cli/conftest.py (100%) rename {tools => tests}/functional/cli/test_cli_artifacts.py (100%) rename {tools => tests}/functional/cli/test_cli_packages.py (100%) rename {tools => tests}/functional/cli/test_cli_v4.py (100%) rename {tools => tests}/functional/cli/test_cli_variables.py (100%) rename {tools => tests}/functional/conftest.py (99%) rename {tools => tests}/functional/ee-test.py (100%) rename {tools => tests}/functional/fixtures/.env (100%) rename {tools => tests}/functional/fixtures/avatar.png (100%) rename {tools => tests}/functional/fixtures/docker-compose.yml (100%) rename {tools => tests}/functional/fixtures/set_token.rb (100%) diff --git a/.renovaterc.json b/.renovaterc.json index b46c8f4cb..1ddc2e836 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -4,7 +4,7 @@ ], "regexManagers": [ { - "fileMatch": ["^tools/functional/fixtures/.env$"], + "fileMatch": ["^tests/functional/fixtures/.env$"], "matchStrings": ["GITLAB_TAG=(?.*?)\n"], "depNameTemplate": "gitlab/gitlab-ce", "datasourceTemplate": "docker", diff --git a/MANIFEST.in b/MANIFEST.in index df53d6691..849cc7d52 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ include COPYING AUTHORS ChangeLog.rst RELEASE_NOTES.rst requirements.txt test-requirements.txt rtd-requirements.txt include tox.ini .travis.yml -recursive-include tools * +recursive-include tests * recursive-include docs *j2 *.py *.rst api/*.rst Makefile make.bat recursive-include gitlab/tests/data * diff --git a/tools/functional/api/test_clusters.py b/tests/functional/api/test_clusters.py similarity index 100% rename from tools/functional/api/test_clusters.py rename to tests/functional/api/test_clusters.py diff --git a/tools/functional/api/test_current_user.py b/tests/functional/api/test_current_user.py similarity index 100% rename from tools/functional/api/test_current_user.py rename to tests/functional/api/test_current_user.py diff --git a/tools/functional/api/test_deploy_keys.py b/tests/functional/api/test_deploy_keys.py similarity index 100% rename from tools/functional/api/test_deploy_keys.py rename to tests/functional/api/test_deploy_keys.py diff --git a/tools/functional/api/test_deploy_tokens.py b/tests/functional/api/test_deploy_tokens.py similarity index 100% rename from tools/functional/api/test_deploy_tokens.py rename to tests/functional/api/test_deploy_tokens.py diff --git a/tools/functional/api/test_gitlab.py b/tests/functional/api/test_gitlab.py similarity index 100% rename from tools/functional/api/test_gitlab.py rename to tests/functional/api/test_gitlab.py diff --git a/tools/functional/api/test_groups.py b/tests/functional/api/test_groups.py similarity index 100% rename from tools/functional/api/test_groups.py rename to tests/functional/api/test_groups.py diff --git a/tools/functional/api/test_import_export.py b/tests/functional/api/test_import_export.py similarity index 100% rename from tools/functional/api/test_import_export.py rename to tests/functional/api/test_import_export.py diff --git a/tools/functional/api/test_issues.py b/tests/functional/api/test_issues.py similarity index 100% rename from tools/functional/api/test_issues.py rename to tests/functional/api/test_issues.py diff --git a/tools/functional/api/test_merge_requests.py b/tests/functional/api/test_merge_requests.py similarity index 100% rename from tools/functional/api/test_merge_requests.py rename to tests/functional/api/test_merge_requests.py diff --git a/tools/functional/api/test_packages.py b/tests/functional/api/test_packages.py similarity index 100% rename from tools/functional/api/test_packages.py rename to tests/functional/api/test_packages.py diff --git a/tools/functional/api/test_projects.py b/tests/functional/api/test_projects.py similarity index 100% rename from tools/functional/api/test_projects.py rename to tests/functional/api/test_projects.py diff --git a/tools/functional/api/test_releases.py b/tests/functional/api/test_releases.py similarity index 100% rename from tools/functional/api/test_releases.py rename to tests/functional/api/test_releases.py diff --git a/tools/functional/api/test_repository.py b/tests/functional/api/test_repository.py similarity index 100% rename from tools/functional/api/test_repository.py rename to tests/functional/api/test_repository.py diff --git a/tools/functional/api/test_snippets.py b/tests/functional/api/test_snippets.py similarity index 100% rename from tools/functional/api/test_snippets.py rename to tests/functional/api/test_snippets.py diff --git a/tools/functional/api/test_users.py b/tests/functional/api/test_users.py similarity index 100% rename from tools/functional/api/test_users.py rename to tests/functional/api/test_users.py diff --git a/tools/functional/api/test_variables.py b/tests/functional/api/test_variables.py similarity index 100% rename from tools/functional/api/test_variables.py rename to tests/functional/api/test_variables.py diff --git a/tools/functional/cli/conftest.py b/tests/functional/cli/conftest.py similarity index 100% rename from tools/functional/cli/conftest.py rename to tests/functional/cli/conftest.py diff --git a/tools/functional/cli/test_cli_artifacts.py b/tests/functional/cli/test_cli_artifacts.py similarity index 100% rename from tools/functional/cli/test_cli_artifacts.py rename to tests/functional/cli/test_cli_artifacts.py diff --git a/tools/functional/cli/test_cli_packages.py b/tests/functional/cli/test_cli_packages.py similarity index 100% rename from tools/functional/cli/test_cli_packages.py rename to tests/functional/cli/test_cli_packages.py diff --git a/tools/functional/cli/test_cli_v4.py b/tests/functional/cli/test_cli_v4.py similarity index 100% rename from tools/functional/cli/test_cli_v4.py rename to tests/functional/cli/test_cli_v4.py diff --git a/tools/functional/cli/test_cli_variables.py b/tests/functional/cli/test_cli_variables.py similarity index 100% rename from tools/functional/cli/test_cli_variables.py rename to tests/functional/cli/test_cli_variables.py diff --git a/tools/functional/conftest.py b/tests/functional/conftest.py similarity index 99% rename from tools/functional/conftest.py rename to tests/functional/conftest.py index 634713d81..5d3b1b97d 100644 --- a/tools/functional/conftest.py +++ b/tests/functional/conftest.py @@ -57,7 +57,7 @@ def temp_dir(): @pytest.fixture(scope="session") def test_dir(pytestconfig): - return pytestconfig.rootdir / "tools" / "functional" + return pytestconfig.rootdir / "tests" / "functional" @pytest.fixture(scope="session") diff --git a/tools/functional/ee-test.py b/tests/functional/ee-test.py similarity index 100% rename from tools/functional/ee-test.py rename to tests/functional/ee-test.py diff --git a/tools/functional/fixtures/.env b/tests/functional/fixtures/.env similarity index 100% rename from tools/functional/fixtures/.env rename to tests/functional/fixtures/.env diff --git a/tools/functional/fixtures/avatar.png b/tests/functional/fixtures/avatar.png similarity index 100% rename from tools/functional/fixtures/avatar.png rename to tests/functional/fixtures/avatar.png diff --git a/tools/functional/fixtures/docker-compose.yml b/tests/functional/fixtures/docker-compose.yml similarity index 100% rename from tools/functional/fixtures/docker-compose.yml rename to tests/functional/fixtures/docker-compose.yml diff --git a/tools/functional/fixtures/set_token.rb b/tests/functional/fixtures/set_token.rb similarity index 100% rename from tools/functional/fixtures/set_token.rb rename to tests/functional/fixtures/set_token.rb diff --git a/tox.ini b/tox.ini index d3dfdfc01..a1b1b4259 100644 --- a/tox.ini +++ b/tox.ini @@ -97,9 +97,9 @@ script_launch_mode = subprocess [testenv:cli_func_v4] deps = -r{toxinidir}/docker-requirements.txt commands = - pytest --cov --cov-report xml tools/functional/cli {posargs} + pytest --cov --cov-report xml tests/functional/cli {posargs} [testenv:py_func_v4] deps = -r{toxinidir}/docker-requirements.txt commands = - pytest --cov --cov-report xml tools/functional/api {posargs} + pytest --cov --cov-report xml tests/functional/api {posargs}