moved tests to testenv

2025-12-12 09:10:30 +08:00 · 2019-04-14 23:15:06 +03:00 · 2019-04-14 23:15:06 +03:00 · bc0deaee5f
commit bc0deaee5f
parent 92260645c5
21 changed files with 8 additions and 6 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -11,4 +11,3 @@
 /*.pkg.tar.xz
 /*.egg-info
 /*kvmd-*.tar.gz
-
--- a/1
+++ b/1
@ -30,6 +30,7 @@ tox: _testenv
 	time docker run --rm \
 			--volume `pwd`:/src:ro \
 			--volume `pwd`/testenv:/src/testenv:rw \
+			--volume `pwd`/testenv/tests:/src/testenv/tests:ro \
 			--volume `pwd`/extras:/usr/share/kvmd/extras:ro \
 			--volume `pwd`/configs:/usr/share/kvmd/configs.default:ro \
 		-it $(TESTENV_IMAGE) bash -c " \
--- a/testenv/tests/init.py
+++ b/testenv/tests/init.py
--- a/testenv/tests/apps/init.py
+++ b/testenv/tests/apps/init.py
--- a/testenv/tests/apps/test_cleanup.py
+++ b/testenv/tests/apps/test_cleanup.py
--- a/testenv/tests/apps/test_htpasswd.py
+++ b/testenv/tests/apps/test_htpasswd.py
--- a/testenv/tests/auth/init.py
+++ b/testenv/tests/auth/init.py
--- a/testenv/tests/auth/test_service_htpasswd.py
+++ b/testenv/tests/auth/test_service_htpasswd.py
--- a/testenv/tests/auth/test_service_http.py
+++ b/testenv/tests/auth/test_service_http.py
--- a/testenv/tests/test_aioregion.py
+++ b/testenv/tests/test_aioregion.py
--- a/testenv/tests/test_gpio.py
+++ b/testenv/tests/test_gpio.py
--- a/testenv/tests/test_keymap.py
+++ b/testenv/tests/test_keymap.py
--- a/testenv/tests/test_logging.py
+++ b/testenv/tests/test_logging.py
--- a/testenv/tests/validators/init.py
+++ b/testenv/tests/validators/init.py
--- a/testenv/tests/validators/test_auth.py
+++ b/testenv/tests/validators/test_auth.py
--- a/testenv/tests/validators/test_basic.py
+++ b/testenv/tests/validators/test_basic.py
--- a/testenv/tests/validators/test_hw.py
+++ b/testenv/tests/validators/test_hw.py
--- a/testenv/tests/validators/test_kvm.py
+++ b/testenv/tests/validators/test_kvm.py
--- a/testenv/tests/validators/test_net.py
+++ b/testenv/tests/validators/test_net.py
--- a/testenv/tests/validators/test_os.py
+++ b/testenv/tests/validators/test_os.py
--- a/testenv/tox.ini
+++ b/testenv/tox.ini
@ -8,14 +8,14 @@ sitepackages = true
 changedir = /src

 [testenv:flake8]
-commands = flake8 --config=testenv/linters/flake8.ini kvmd genmap.py tests
+commands = flake8 --config=testenv/linters/flake8.ini kvmd genmap.py testenv/tests
 deps =
 	flake8
 	flake8-double-quotes
 	-rrequirements.txt

 [testenv:pylint]
-commands = pylint --rcfile=testenv/linters/pylint.ini --output-format=colorized --reports=no kvmd genmap.py tests
+commands = pylint --rcfile=testenv/linters/pylint.ini --output-format=colorized --reports=no kvmd genmap.py testenv/tests
 deps =
 	pylint
 	pytest
@ -24,19 +24,21 @@ deps =
 	-rrequirements.txt

 [testenv:mypy]
-commands = mypy --config-file=testenv/linters/mypy.ini --cache-dir=testenv/.mypy_cache kvmd genmap.py tests
+commands = mypy --config-file=testenv/linters/mypy.ini --cache-dir=testenv/.mypy_cache kvmd genmap.py testenv/tests
 deps =
 	mypy
 	-rrequirements.txt

 [testenv:vulture]
-commands = vulture --ignore-names=_format_P,Plugin --ignore-decorators=@_exposed,@_system_task,@pytest.fixture kvmd genmap.py tests testenv/linters/vulture-wl.py
+commands = vulture --ignore-names=_format_P,Plugin --ignore-decorators=@_exposed,@_system_task,@pytest.fixture kvmd genmap.py testenv/tests testenv/linters/vulture-wl.py
 deps =
 	vulture
 	-rrequirements.txt

 [testenv:pytest]
-commands = py.test -vv --cov-config=testenv/linters/coverage.ini --cov-report=term-missing --cov=kvmd tests
+commands = py.test -vv --cov-config=testenv/linters/coverage.ini --cov-report=term-missing --cov=kvmd testenv/tests
+setenv =
+	PYTHONPATH=/src
 deps =
 	pytest
 	pytest-cov