Using testr directly instead of run_test.sh

Rewritten-From: 4edd1222d97901d673fe8e07e91f31b0b227b030

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index dbd1fcf8910f12abb8d316a4aeb999ce474fbd3e..0e84dfddae523281ee2d428301aa04b0763fa323 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+heat (2014.1~b3-2) experimental; urgency=low
+
+  * Using testr directly instead of run_test.sh.
+
+ -- Thomas Goirand <zigo@debian.org>  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/trusty/debian/control b/trusty/debian/control
index 64ad8b3248a1f55921f6b86a8766ac1f4cd5d2b7..bc669793009da08a1c091305fa3a86dcd2dbee6d 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/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/trusty/debian/rules b/trusty/debian/rules
index e504c40e02454241e19d2e0107d640ed5ee5f60e..dbf3f407894532752a0243d2f0e3de00af60412c 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/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: