Fix again unit tests.

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

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 0ab18541ea815a1f8e73c9a40edef5cba0d27268..a7c8a708e5c991b7549cca01f5689af7770cc23e 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/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,8 +35,11 @@ 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
-       #PYTHONPATH=. nosetests -P || true
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+       rm -rf .testrepository
+       testr init
+       bash -x ./setup-test-env.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | subunit2pyunit || true
+       testr slowest
+       testr last --subunit | subunit-filter -s --no-passthrough | subunit-stats
 endif