summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2020-03-10 13:26:05 -0400
committerGitHub <noreply@github.com>2020-03-10 11:26:05 -0600
commit986f37b017134ced5d9dd38b420350916297002b (patch)
tree59fe191bbc8641a14d60f37499412912ba824443 /Makefile
parent71af48df3514ca831c90b77dc71ba0a121dec401 (diff)
downloadvyos-cloud-init-986f37b017134ced5d9dd38b420350916297002b.tar.gz
vyos-cloud-init-986f37b017134ced5d9dd38b420350916297002b.zip
cloudinit: move to pytest for running tests (#211)
As the nose docs[0] themselves note, it has been in maintenance mode for the past several years. pytest is an actively developed, featureful and popular alternative that the nose docs themselves recommend. See [1] for more details about the thinking here. (This PR also removes stale tox definitions, instead of modifying them.) [0] https://nose.readthedocs.io/en/latest/ [1] https://lists.launchpad.net/cloud-init/msg00245.html
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 315e6b45..5f575633 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,6 @@ CWD=$(shell pwd)
PYVER ?= $(shell for p in python3 python2; do \
out=$$(command -v $$p 2>&1) && echo $$p && exit; done; exit 1)
-noseopts ?= -v
-
YAML_FILES=$(shell find cloudinit tests tools -name "*.yaml" -type f )
YAML_FILES+=$(shell find doc/examples -name "cloud-config*.txt" -type f )
@@ -48,10 +46,10 @@ pyflakes3:
@$(CWD)/tools/run-pyflakes3
unittest: clean_pyc
- nosetests $(noseopts) tests/unittests cloudinit
+ python -m pytest -v tests/unittests cloudinit
unittest3: clean_pyc
- nosetests3 $(noseopts) tests/unittests cloudinit
+ python3 -m pytest -v tests/unittests cloudinit
ci-deps-ubuntu:
@$(PYVER) $(CWD)/tools/read-dependencies --distro ubuntu --test-distro