From 112d25e6b2a20e8e39c1f22f6a30e0130616c64f Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Thu, 3 Mar 2016 12:53:41 -0500
Subject: make package build run tests

---
 Makefile                 | 4 ++--
 packages/debian/rules.in | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 8987d51c..a7fa5a3b 100644
--- a/Makefile
+++ b/Makefile
@@ -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
-- 
cgit v1.2.3