From: Thomas Goirand <thomas@goirand.fr>
Date: Sun, 30 Mar 2014 05:26:09 +0000 (+0800)
Subject: Better testr/subunit output.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b3e4bd5c45781d626563512d93dc507eae537b57;p=openstack-build%2Fceilometer-build.git

Better testr/subunit output.

Rewritten-From: e6efeb5cc76d0da39160c1ec955748db0cf78ff6
---

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 0b90df0..fcec010 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,9 @@
+ceilometer (2014.1~b3-2) UNRELEASED; urgency=low
+
+  * Better testr/subunit output.
+
+ -- Thomas Goirand <zigo@debian.org>  Sun, 30 Mar 2014 13:25:59 +0800
+
 ceilometer (2014.1~b3-1) experimental; urgency=low
 
   * New upstream release (Icehouse beta 3).
diff --git a/xenial/debian/control b/xenial/debian/control
index 3d7c2bf..7bae21d 100644
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -68,8 +68,9 @@ Build-Depends-Indep: alembic (>= 0.4.2),
                      python-webob (>= 1.2.3),
                      python-wsme (>= 0.6),
                      python-yaml,
+                     subunit (>= 0.0.18),
                      testrepository (>= 0.0.18)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/ceilometer.git;a=summary
 Vcs-Git: git://anonscm.debian.org/openstack/ceilometer.git
 Homepage: http://wiki.openstack.org/Ceilometer
diff --git a/xenial/debian/rules b/xenial/debian/rules
index 9335d2d..a3a99cc 100755
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -34,9 +34,12 @@ override_dh_auto_clean:
 	rm -rf debian/ceilometer-common.postinst
 	find . -iname '*.pyc' -delete
 
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	bash -x ./setup-test-env.sh python setup.py testr --slowest --testr-args='tests\.(?!.*test_bin.*)' || true
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+	set -e && TEMP_REZ=`mktemp -t` && \
+		bash -x ./setup-test-env.sh python setup.py testr --slowest  --testr-args='--subunit  --omit=test_bin.py  ' | tee $$TEMP_REZ | subunit2pyunit || true ; \
+		cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats || true ; \
+		rm -f $$TEMP_REZ
 	#./run-tests.sh || true
 	#PYTHONPATH=. nosetests -P || true
 endif