moved tests to testenv

21 files changed, 8 insertions, 6 deletions

diff --git a/.dockerignore b/.dockerignore
index 4e0990a5..c4c723c2 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -11,4 +11,3 @@
 /*.pkg.tar.xz
 /*.egg-info
 /*kvmd-*.tar.gz
-
diff --git a/Makefile b/Makefile
index cad1e342..3e19bd9f 100644
--- a/Makefile
+++ b/Makefile
@@ -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 " \
diff --git a/tests/__init__.py b/testenv/tests/__init__.py
index d1faace6..d1faace6 100644
--- a/tests/__init__.py
+++ b/testenv/tests/__init__.py
diff --git a/tests/apps/__init__.py b/testenv/tests/apps/__init__.py
index 1e91f7fa..1e91f7fa 100644
--- a/tests/apps/__init__.py
+++ b/testenv/tests/apps/__init__.py
diff --git a/tests/apps/test_cleanup.py b/testenv/tests/apps/test_cleanup.py
index 3e2e4c72..3e2e4c72 100644
--- a/tests/apps/test_cleanup.py
+++ b/testenv/tests/apps/test_cleanup.py
diff --git a/tests/apps/test_htpasswd.py b/testenv/tests/apps/test_htpasswd.py
index 52a38640..52a38640 100644
--- a/tests/apps/test_htpasswd.py
+++ b/testenv/tests/apps/test_htpasswd.py
diff --git a/tests/auth/__init__.py b/testenv/tests/auth/__init__.py
index cdaa6cfb..cdaa6cfb 100644
--- a/tests/auth/__init__.py
+++ b/testenv/tests/auth/__init__.py
diff --git a/tests/auth/test_service_htpasswd.py b/testenv/tests/auth/test_service_htpasswd.py
index 6378d896..6378d896 100644
--- a/tests/auth/test_service_htpasswd.py
+++ b/testenv/tests/auth/test_service_htpasswd.py
diff --git a/tests/auth/test_service_http.py b/testenv/tests/auth/test_service_http.py
index c6f2b631..c6f2b631 100644
--- a/tests/auth/test_service_http.py
+++ b/testenv/tests/auth/test_service_http.py
diff --git a/tests/test_aioregion.py b/testenv/tests/test_aioregion.py
index 601f5280..601f5280 100644
--- a/tests/test_aioregion.py
+++ b/testenv/tests/test_aioregion.py
diff --git a/tests/test_gpio.py b/testenv/tests/test_gpio.py
index 6a02816d..6a02816d 100644
--- a/tests/test_gpio.py
+++ b/testenv/tests/test_gpio.py
diff --git a/tests/test_keymap.py b/testenv/tests/test_keymap.py
index f69accb1..f69accb1 100644
--- a/tests/test_keymap.py
+++ b/testenv/tests/test_keymap.py
diff --git a/tests/test_logging.py b/testenv/tests/test_logging.py
index e6372e33..e6372e33 100644
--- a/tests/test_logging.py
+++ b/testenv/tests/test_logging.py
diff --git a/tests/validators/__init__.py b/testenv/tests/validators/__init__.py
index 1e91f7fa..1e91f7fa 100644
--- a/tests/validators/__init__.py
+++ b/testenv/tests/validators/__init__.py
diff --git a/tests/validators/test_auth.py b/testenv/tests/validators/test_auth.py
index f3cdf939..f3cdf939 100644
--- a/tests/validators/test_auth.py
+++ b/testenv/tests/validators/test_auth.py
diff --git a/tests/validators/test_basic.py b/testenv/tests/validators/test_basic.py
index 96feb666..96feb666 100644
--- a/tests/validators/test_basic.py
+++ b/testenv/tests/validators/test_basic.py
diff --git a/tests/validators/test_hw.py b/testenv/tests/validators/test_hw.py
index 2c93d3eb..2c93d3eb 100644
--- a/tests/validators/test_hw.py
+++ b/testenv/tests/validators/test_hw.py
diff --git a/tests/validators/test_kvm.py b/testenv/tests/validators/test_kvm.py
index f1050b36..f1050b36 100644
--- a/tests/validators/test_kvm.py
+++ b/testenv/tests/validators/test_kvm.py
diff --git a/tests/validators/test_net.py b/testenv/tests/validators/test_net.py
index eab67c9a..eab67c9a 100644
--- a/tests/validators/test_net.py
+++ b/testenv/tests/validators/test_net.py
diff --git a/tests/validators/test_os.py b/testenv/tests/validators/test_os.py
index b280b4b3..b280b4b3 100644
--- a/tests/validators/test_os.py
+++ b/testenv/tests/validators/test_os.py
diff --git a/testenv/tox.ini b/testenv/tox.ini
index 55d51892..b63b5071 100644
--- 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