make test discovery work with unittest

sibson · Dec 22, 2022 · c24f909 · c24f909
1 parent a26b4da
commit c24f909
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml
@@ -26,4 +26,4 @@ jobs:
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Run Unit Tests
       run: |
-        python -m unittest tests/unit/*.py
+        python -m unittest discover tests/unit
diff --git a/makefile b/makefile
@@ -2,6 +2,8 @@
 .DEFAULT: help
 
 VERSION_FILE?=vncdotool/__init__.py
+PYTHON?=.venv/bin/python
+
 
 help:
 	@echo "test:		run tests"
@@ -21,7 +23,6 @@ version-%:
 	git ci $(VERSION_FILE) -m"bump version to $*"
 
 release: release-test release-tag upload
-
 release-test: test
 
 release-tag: VERSION:=$(shell python setup.py --version)
@@ -30,11 +31,15 @@ release-tag:
 	git push --tags
 
 upload:
-	python setup.py sdist
+	$(PYTHON) setup.py sdist
 	twine upload dist/$(shell python setup.py --fullname).*
 
 docs:
 		$(MAKE) -C docs/ html
 
+venv: $(PYTHON)
+.venv: requirements.txt requirements-dev.txt
+	python3 -m virtualenv .venv
+
 test:
-	nosetests tests/unit
+	$(PYTHON) -m unittest discover tests/unit