diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | packages/debian/rules.in | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1,6 +1,7 @@ CWD=$(shell pwd) PY_FILES=$(shell find cloudinit bin tests tools -name "*.py" -type f ) PY_FILES+="bin/cloud-init" +noseopts ?= -v YAML_FILES=$(shell find cloudinit bin tests tools -name "*.yaml" -type f ) YAML_FILES+=$(shell find doc/examples -name "cloud-config*.txt" -type f ) @@ -33,8 +34,7 @@ pip-test-requirements: $(PIP_INSTALL) -r "$@.txt" -q test: clean_pyc - @echo "Running tests..." - @nosetests $(noseopts) tests/ + @n=$$(which nosetests3) || n=nosetests; set -- $$n $(noseopts) tests/; echo "Running $$*"; "$$@" check_version: @if [ "$(CHANGELOG_VERSION)" != "$(CODE_VERSION)" ]; then \ diff --git a/packages/debian/rules.in b/packages/debian/rules.in index bb2e1d5c..d6cd23ae 100755 --- a/packages/debian/rules.in +++ b/packages/debian/rules.in @@ -16,4 +16,4 @@ override_dh_install: override_dh_auto_test: # Because setup tools didn't copy data... [ ! -d .pybuild/pythonX.Y_?.?/build/tests ] || cp -r tests/data .pybuild/pythonX.Y_?.?/build/tests - http_proxy= dh_auto_test -- --test-nose + http_proxy= make check |