Fixed testr/subunit output again.

[openstack-build/ceilometer-build.git] / trusty / debian / rules

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 0e851ad9c3ca43d97b256eba62351ed08e396bac..5cfd5d2668bd989fc70a07a88cfca1d32f07b444 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -11,8 +11,9 @@ export OSLO_PACKAGE_VERSION=$(VERSION)
 
 override_dh_clean:
        dh_clean
+       rm -rf .testrepository
        rm -rf ceilometer.egg-info
-       rm -f debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
+       rm -f debian/ceilometer-common.config debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
 
 override_dh_install:
        dh_install
@@ -23,6 +24,7 @@ override_dh_install:
 
 override_dh_auto_build:
        dh_auto_build
+       /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-common.config
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-common.postinst
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-api.config
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-api.postinst
@@ -33,7 +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:
-       PYTHONPATH=. nosetests -P || 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