From 6dd0ac589fdfe0126fa971a6681832bd1846eb8f Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Sun, 16 Mar 2014 15:20:14 +0800 Subject: [PATCH] Using testr directly instead of run_test.sh Rewritten-From: 4edd1222d97901d673fe8e07e91f31b0b227b030 --- xenial/debian/changelog | 6 ++++++ xenial/debian/control | 3 ++- xenial/debian/rules | 7 ++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/xenial/debian/changelog b/xenial/debian/changelog index dbd1fcf8..0e84dfdd 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -1,3 +1,9 @@ +heat (2014.1~b3-2) experimental; urgency=low + + * Using testr directly instead of run_test.sh. + + -- Thomas Goirand Sun, 16 Mar 2014 15:19:57 +0800 + heat (2014.1~b3-1) experimental; urgency=low * New upstream release (Icehouse beta 3). diff --git a/xenial/debian/control b/xenial/debian/control index 64ad8b32..bc669793 100644 --- a/xenial/debian/control +++ b/xenial/debian/control @@ -58,7 +58,8 @@ Build-Depends-Indep: python-babel (>= 1.3), python-troveclient (>= 1.0.3), python-webob (>= 1.2.3), python-yaml, - testrepository (>= 0.0.18) + testrepository (>= 0.0.18), + subunit (>= 0.0.18) Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/heat.git;a=summary Vcs-Git: git://anonscm.debian.org/openstack/heat.git diff --git a/xenial/debian/rules b/xenial/debian/rules index e504c40e..dbf3f407 100755 --- a/xenial/debian/rules +++ b/xenial/debian/rules @@ -8,7 +8,12 @@ export OSLO_PACKAGE_VERSION=$(VERSION) ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: - ./run_tests.sh || true + set -e && set -x && \ + TEMP_REZ=`mktemp -t` && \ + python setup.py testr --slowest --testr-args='--subunit ' \ + | tee $$TEMP_REZ | subunit2pyunit && \ + cat $$TEMP_REZ | subunit-stats && \ + rm -f $$TEMP_REZ endif override_dh_clean: -- 2.45.2