X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Frules;h=5cfd5d2668bd989fc70a07a88cfca1d32f07b444;hb=6fd92683480f71c9e4896172ced6ba5daf41b3e8;hp=cdea67b7b8d99521bbfa120d253b2c4c74c6cf24;hpb=40ababf7a3fe6165945c19605ae851b845199f3b;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/rules b/trusty/debian/rules
index cdea67b..5cfd5d2 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -11,6 +11,7 @@ export OSLO_PACKAGE_VERSION=$(VERSION)
 
 override_dh_clean:
 	dh_clean
+	rm -rf .testrepository
 	rm -rf ceilometer.egg-info
 	rm -f debian/ceilometer-common.config debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
 
@@ -34,8 +35,14 @@ override_dh_auto_clean:
 	rm -rf debian/ceilometer-common.postinst
 	find . -iname '*.pyc' -delete
 
-ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	./run-tests.sh || true
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+	set -e && TEMP_REZ=`mktemp -t` && \
+		rm -rf .testrepository ; \
+		testr init ; \
+		bash -x ./setup-test-env.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | 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