python-gitlab · nejch · May 26, 2021 · May 26, 2021
diff --git a/.renovaterc.json b/.renovaterc.json
@@ -4,7 +4,7 @@
   ],
   "regexManagers": [
     {
-      "fileMatch": ["^tools/functional/fixtures/.env$"],
+      "fileMatch": ["^tests/functional/fixtures/.env$"],
       "matchStrings": ["GITLAB_TAG=(?<currentValue>.*?)\n"],
       "depNameTemplate": "gitlab/gitlab-ce",
       "datasourceTemplate": "docker",

diff --git 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 → tests/functional/api/test_clusters.py b/tools/functional/api/test_clusters.py → tests/functional/api/test_clusters.py
diff --git a/tools/functional/api/test_current_user.py → tests/functional/api/test_current_user.py b/tools/functional/api/test_current_user.py → tests/functional/api/test_current_user.py
diff --git a/tools/functional/api/test_deploy_keys.py → tests/functional/api/test_deploy_keys.py b/tools/functional/api/test_deploy_keys.py → tests/functional/api/test_deploy_keys.py
diff --git a/tools/functional/api/test_deploy_tokens.py → tests/functional/api/test_deploy_tokens.py b/tools/functional/api/test_deploy_tokens.py → tests/functional/api/test_deploy_tokens.py
diff --git a/tools/functional/api/test_gitlab.py → tests/functional/api/test_gitlab.py b/tools/functional/api/test_gitlab.py → tests/functional/api/test_gitlab.py
diff --git a/tools/functional/api/test_groups.py → tests/functional/api/test_groups.py b/tools/functional/api/test_groups.py → tests/functional/api/test_groups.py
diff --git a/tools/functional/api/test_import_export.py → tests/functional/api/test_import_export.py b/tools/functional/api/test_import_export.py → tests/functional/api/test_import_export.py
diff --git a/tools/functional/api/test_issues.py → tests/functional/api/test_issues.py b/tools/functional/api/test_issues.py → tests/functional/api/test_issues.py
diff --git a/tools/functional/api/test_merge_requests.py → tests/functional/api/test_merge_requests.py b/tools/functional/api/test_merge_requests.py → tests/functional/api/test_merge_requests.py
diff --git a/tools/functional/api/test_packages.py → tests/functional/api/test_packages.py b/tools/functional/api/test_packages.py → tests/functional/api/test_packages.py
diff --git a/tools/functional/api/test_projects.py → tests/functional/api/test_projects.py b/tools/functional/api/test_projects.py → tests/functional/api/test_projects.py
diff --git a/tools/functional/api/test_releases.py → tests/functional/api/test_releases.py b/tools/functional/api/test_releases.py → tests/functional/api/test_releases.py
diff --git a/tools/functional/api/test_repository.py → tests/functional/api/test_repository.py b/tools/functional/api/test_repository.py → tests/functional/api/test_repository.py
diff --git a/tools/functional/api/test_snippets.py → tests/functional/api/test_snippets.py b/tools/functional/api/test_snippets.py → tests/functional/api/test_snippets.py
diff --git a/tools/functional/api/test_users.py → tests/functional/api/test_users.py b/tools/functional/api/test_users.py → tests/functional/api/test_users.py
diff --git a/tools/functional/api/test_variables.py → tests/functional/api/test_variables.py b/tools/functional/api/test_variables.py → tests/functional/api/test_variables.py
diff --git a/tools/functional/cli/conftest.py → tests/functional/cli/conftest.py b/tools/functional/cli/conftest.py → tests/functional/cli/conftest.py
diff --git a/tools/functional/cli/test_cli_artifacts.py → tests/functional/cli/test_cli_artifacts.py b/tools/functional/cli/test_cli_artifacts.py → tests/functional/cli/test_cli_artifacts.py
diff --git a/tools/functional/cli/test_cli_packages.py → tests/functional/cli/test_cli_packages.py b/tools/functional/cli/test_cli_packages.py → tests/functional/cli/test_cli_packages.py
diff --git a/tools/functional/cli/test_cli_v4.py → tests/functional/cli/test_cli_v4.py b/tools/functional/cli/test_cli_v4.py → tests/functional/cli/test_cli_v4.py
diff --git a/tools/functional/cli/test_cli_variables.py → tests/functional/cli/test_cli_variables.py b/tools/functional/cli/test_cli_variables.py → tests/functional/cli/test_cli_variables.py
diff --git a/tools/functional/conftest.py → tests/functional/conftest.py b/tools/functional/conftest.py → 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 → tests/functional/ee-test.py b/tools/functional/ee-test.py → tests/functional/ee-test.py
diff --git a/tools/functional/fixtures/.env → tests/functional/fixtures/.env b/tools/functional/fixtures/.env → tests/functional/fixtures/.env
diff --git a/tools/functional/fixtures/avatar.png → tests/functional/fixtures/avatar.png b/tools/functional/fixtures/avatar.png → tests/functional/fixtures/avatar.png
diff --git a/tools/functional/fixtures/docker-compose.yml → tests/functional/fixtures/docker-compose.yml b/tools/functional/fixtures/docker-compose.yml → tests/functional/fixtures/docker-compose.yml
diff --git a/tools/functional/fixtures/set_token.rb → tests/functional/fixtures/set_token.rb b/tools/functional/fixtures/set_token.rb → tests/functional/fixtures/set_token.rb
diff --git 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}