Skip to content

Commit 90ecf2f

Browse files
authored
Merge pull request #1469 from JohnVillalovos/jlvillal/test_directory
chore: rename 'tools/functional/' to 'tests/functional/'
2 parents 9beff0d + 502715d commit 90ecf2f

30 files changed

+5
-5
lines changed

.renovaterc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
],
55
"regexManagers": [
66
{
7-
"fileMatch": ["^tools/functional/fixtures/.env$"],
7+
"fileMatch": ["^tests/functional/fixtures/.env$"],
88
"matchStrings": ["GITLAB_TAG=(?<currentValue>.*?)\n"],
99
"depNameTemplate": "gitlab/gitlab-ce",
1010
"datasourceTemplate": "docker",

MANIFEST.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
include COPYING AUTHORS ChangeLog.rst RELEASE_NOTES.rst requirements.txt test-requirements.txt rtd-requirements.txt
22
include tox.ini .travis.yml
3-
recursive-include tools *
3+
recursive-include tests *
44
recursive-include docs *j2 *.py *.rst api/*.rst Makefile make.bat
55
recursive-include gitlab/tests/data *
File renamed without changes.

tools/functional/conftest.py renamed to tests/functional/conftest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def temp_dir():
5757

5858
@pytest.fixture(scope="session")
5959
def test_dir(pytestconfig):
60-
return pytestconfig.rootdir / "tools" / "functional"
60+
return pytestconfig.rootdir / "tests" / "functional"
6161

6262

6363
@pytest.fixture(scope="session")
File renamed without changes.
File renamed without changes.

tox.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ script_launch_mode = subprocess
9797
[testenv:cli_func_v4]
9898
deps = -r{toxinidir}/docker-requirements.txt
9999
commands =
100-
pytest --cov --cov-report xml tools/functional/cli {posargs}
100+
pytest --cov --cov-report xml tests/functional/cli {posargs}
101101

102102
[testenv:py_func_v4]
103103
deps = -r{toxinidir}/docker-requirements.txt
104104
commands =
105-
pytest --cov --cov-report xml tools/functional/api {posargs}
105+
pytest --cov --cov-report xml tests/functional/api {posargs}

0 commit comments

Comments
 (0)