summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn L. Villalovos <john@sodarock.com>2021-05-25 17:35:17 -0700
committerJohn L. Villalovos <john@sodarock.com>2021-05-26 06:42:19 -0700
commit502715d99e02105c39b2c5cf0e7457b3256eba0d (patch)
treee9064cda7c903159d8025def351475c10a707118
parent9beff0d484b5fe86e2cd31f20cf00a309e09cf75 (diff)
downloadgitlab-502715d99e02105c39b2c5cf0e7457b3256eba0d.tar.gz
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
-rw-r--r--.renovaterc.json2
-rw-r--r--MANIFEST.in2
-rw-r--r--tests/functional/api/test_clusters.py (renamed from tools/functional/api/test_clusters.py)0
-rw-r--r--tests/functional/api/test_current_user.py (renamed from tools/functional/api/test_current_user.py)0
-rw-r--r--tests/functional/api/test_deploy_keys.py (renamed from tools/functional/api/test_deploy_keys.py)0
-rw-r--r--tests/functional/api/test_deploy_tokens.py (renamed from tools/functional/api/test_deploy_tokens.py)0
-rw-r--r--tests/functional/api/test_gitlab.py (renamed from tools/functional/api/test_gitlab.py)0
-rw-r--r--tests/functional/api/test_groups.py (renamed from tools/functional/api/test_groups.py)0
-rw-r--r--tests/functional/api/test_import_export.py (renamed from tools/functional/api/test_import_export.py)0
-rw-r--r--tests/functional/api/test_issues.py (renamed from tools/functional/api/test_issues.py)0
-rw-r--r--tests/functional/api/test_merge_requests.py (renamed from tools/functional/api/test_merge_requests.py)0
-rw-r--r--tests/functional/api/test_packages.py (renamed from tools/functional/api/test_packages.py)0
-rw-r--r--tests/functional/api/test_projects.py (renamed from tools/functional/api/test_projects.py)0
-rw-r--r--tests/functional/api/test_releases.py (renamed from tools/functional/api/test_releases.py)0
-rw-r--r--tests/functional/api/test_repository.py (renamed from tools/functional/api/test_repository.py)0
-rw-r--r--tests/functional/api/test_snippets.py (renamed from tools/functional/api/test_snippets.py)0
-rw-r--r--tests/functional/api/test_users.py (renamed from tools/functional/api/test_users.py)0
-rw-r--r--tests/functional/api/test_variables.py (renamed from tools/functional/api/test_variables.py)0
-rw-r--r--tests/functional/cli/conftest.py (renamed from tools/functional/cli/conftest.py)0
-rw-r--r--tests/functional/cli/test_cli_artifacts.py (renamed from tools/functional/cli/test_cli_artifacts.py)0
-rw-r--r--tests/functional/cli/test_cli_packages.py (renamed from tools/functional/cli/test_cli_packages.py)0
-rw-r--r--tests/functional/cli/test_cli_v4.py (renamed from tools/functional/cli/test_cli_v4.py)0
-rw-r--r--tests/functional/cli/test_cli_variables.py (renamed from tools/functional/cli/test_cli_variables.py)0
-rw-r--r--tests/functional/conftest.py (renamed from tools/functional/conftest.py)2
-rwxr-xr-xtests/functional/ee-test.py (renamed from tools/functional/ee-test.py)0
-rw-r--r--tests/functional/fixtures/.env (renamed from tools/functional/fixtures/.env)0
-rw-r--r--tests/functional/fixtures/avatar.png (renamed from tools/functional/fixtures/avatar.png)bin592 -> 592 bytes
-rw-r--r--tests/functional/fixtures/docker-compose.yml (renamed from tools/functional/fixtures/docker-compose.yml)0
-rw-r--r--tests/functional/fixtures/set_token.rb (renamed from tools/functional/fixtures/set_token.rb)0
-rw-r--r--tox.ini4
30 files changed, 5 insertions, 5 deletions
diff --git a/.renovaterc.json b/.renovaterc.json
index b46c8f4..1ddc2e8 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=(?<currentValue>.*?)\n"],
"depNameTemplate": "gitlab/gitlab-ce",
"datasourceTemplate": "docker",
diff --git a/MANIFEST.in b/MANIFEST.in
index df53d66..849cc7d 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
index 8930aad..8930aad 100644
--- a/tools/functional/api/test_clusters.py
+++ b/tests/functional/api/test_clusters.py
diff --git a/tools/functional/api/test_current_user.py b/tests/functional/api/test_current_user.py
index 5802457..5802457 100644
--- a/tools/functional/api/test_current_user.py
+++ b/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
index 18828a2..18828a2 100644
--- a/tools/functional/api/test_deploy_keys.py
+++ b/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
index efcf8b1..efcf8b1 100644
--- a/tools/functional/api/test_deploy_tokens.py
+++ b/tests/functional/api/test_deploy_tokens.py
diff --git a/tools/functional/api/test_gitlab.py b/tests/functional/api/test_gitlab.py
index 7a70a56..7a70a56 100644
--- a/tools/functional/api/test_gitlab.py
+++ b/tests/functional/api/test_gitlab.py
diff --git a/tools/functional/api/test_groups.py b/tests/functional/api/test_groups.py
index eae2d9b..eae2d9b 100644
--- a/tools/functional/api/test_groups.py
+++ b/tests/functional/api/test_groups.py
diff --git a/tools/functional/api/test_import_export.py b/tests/functional/api/test_import_export.py
index d4bdd19..d4bdd19 100644
--- a/tools/functional/api/test_import_export.py
+++ b/tests/functional/api/test_import_export.py
diff --git a/tools/functional/api/test_issues.py b/tests/functional/api/test_issues.py
index f3a606b..f3a606b 100644
--- a/tools/functional/api/test_issues.py
+++ b/tests/functional/api/test_issues.py
diff --git a/tools/functional/api/test_merge_requests.py b/tests/functional/api/test_merge_requests.py
index e768234..e768234 100644
--- a/tools/functional/api/test_merge_requests.py
+++ b/tests/functional/api/test_merge_requests.py
diff --git a/tools/functional/api/test_packages.py b/tests/functional/api/test_packages.py
index 9160a68..9160a68 100644
--- a/tools/functional/api/test_packages.py
+++ b/tests/functional/api/test_packages.py
diff --git a/tools/functional/api/test_projects.py b/tests/functional/api/test_projects.py
index 0823c00..0823c00 100644
--- a/tools/functional/api/test_projects.py
+++ b/tests/functional/api/test_projects.py
diff --git a/tools/functional/api/test_releases.py b/tests/functional/api/test_releases.py
index f49181a..f49181a 100644
--- a/tools/functional/api/test_releases.py
+++ b/tests/functional/api/test_releases.py
diff --git a/tools/functional/api/test_repository.py b/tests/functional/api/test_repository.py
index 7ba84ea..7ba84ea 100644
--- a/tools/functional/api/test_repository.py
+++ b/tests/functional/api/test_repository.py
diff --git a/tools/functional/api/test_snippets.py b/tests/functional/api/test_snippets.py
index 936fbfb..936fbfb 100644
--- a/tools/functional/api/test_snippets.py
+++ b/tests/functional/api/test_snippets.py
diff --git a/tools/functional/api/test_users.py b/tests/functional/api/test_users.py
index 1ef237c..1ef237c 100644
--- a/tools/functional/api/test_users.py
+++ b/tests/functional/api/test_users.py
diff --git a/tools/functional/api/test_variables.py b/tests/functional/api/test_variables.py
index d20ebba..d20ebba 100644
--- a/tools/functional/api/test_variables.py
+++ b/tests/functional/api/test_variables.py
diff --git a/tools/functional/cli/conftest.py b/tests/functional/cli/conftest.py
index ba94dcb..ba94dcb 100644
--- a/tools/functional/cli/conftest.py
+++ b/tests/functional/cli/conftest.py
diff --git a/tools/functional/cli/test_cli_artifacts.py b/tests/functional/cli/test_cli_artifacts.py
index 4cb69aa..4cb69aa 100644
--- a/tools/functional/cli/test_cli_artifacts.py
+++ b/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
index a3734a2..a3734a2 100644
--- a/tools/functional/cli/test_cli_packages.py
+++ b/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
index a63c1b1..a63c1b1 100644
--- a/tools/functional/cli/test_cli_v4.py
+++ b/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
index 9b1b16d..9b1b16d 100644
--- a/tools/functional/cli/test_cli_variables.py
+++ b/tests/functional/cli/test_cli_variables.py
diff --git a/tools/functional/conftest.py b/tests/functional/conftest.py
index 634713d..5d3b1b9 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
index 3a99951..3a99951 100755
--- a/tools/functional/ee-test.py
+++ b/tests/functional/ee-test.py
diff --git a/tools/functional/fixtures/.env b/tests/functional/fixtures/.env
index eacfb28..eacfb28 100644
--- a/tools/functional/fixtures/.env
+++ b/tests/functional/fixtures/.env
diff --git a/tools/functional/fixtures/avatar.png b/tests/functional/fixtures/avatar.png
index a3a767c..a3a767c 100644
--- a/tools/functional/fixtures/avatar.png
+++ b/tests/functional/fixtures/avatar.png
Binary files differ
diff --git a/tools/functional/fixtures/docker-compose.yml b/tests/functional/fixtures/docker-compose.yml
index a0794d6..a0794d6 100644
--- a/tools/functional/fixtures/docker-compose.yml
+++ b/tests/functional/fixtures/docker-compose.yml
diff --git a/tools/functional/fixtures/set_token.rb b/tests/functional/fixtures/set_token.rb
index 735dcd5..735dcd5 100644
--- a/tools/functional/fixtures/set_token.rb
+++ b/tests/functional/fixtures/set_token.rb
diff --git a/tox.ini b/tox.ini
index d3dfdfc..a1b1b42 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}