Merge branch 'debian/kilo' of git+ssh://git.debian.org/git/openstack/ceilometer into...

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

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 79608a6157635883d82b497b27126e29198c7615..7de1744dc1b4e7e565ae2c7a0fe661d4ff2895ac 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -24,6 +24,7 @@ override_dh_install:
                --namespace ceilometer \
                --namespace oslo.db \
                --namespace oslo.messaging \
+               --namespace oslo.policy \
                --namespace keystonemiddleware.auth_token
        sed -i 's|[# \t]*auth_protocol[\t ]*=.*|auth_protocol=http|' $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
        chmod 0644 $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
@@ -46,10 +47,10 @@ override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
        rm -rf .testrepository
        testr init
-       set -e && \
-               TEMP_REZ=`mktemp -t` && \
-               bash -x ./setup-test-env-mongodb.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit || true ; \
-               cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats || true ; \
+       set -e ; \
+               TEMP_REZ=`mktemp -t` ; \
+               bash -x ./setup-test-env-mongodb.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit ; \
+               cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
                rm -f $$TEMP_REZ ;
        testr slowest
 endif