Using ostestr, not testr directly.

Rewritten-From: ed90b25e40d3085eb894c7871d9023f2e701bd88

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 551a710bcfcbc9ce75f5f0cf1c4ff90f4f0b326b..51dc2d1b2b6d5a12f9d2ace21010fc0123bb78f8 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -7,7 +7,7 @@ neutron (2:9.0.0~b1-1) experimental; urgency=medium
   * Added fix-requirements.txt.patch.
   * Disable auto_clean as it requires a higher version of setuptools, which
     isn't in the sbuild host for Jessie.
-  * Using testr directly, not using ./run_tests.sh anymore.
+  * Using ostestr directly, not using ./run_tests.sh anymore.
 
  -- Thomas Goirand <zigo@debian.org>  Thu, 09 Jun 2016 00:59:14 +0200
 

diff --git a/xenial/debian/rules b/xenial/debian/rules
index e83cdf5a9a3eb30e70bf266686b222d56f724c35..2ac86a61ca30e3426666ef9766fe95e67417492f 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -173,18 +173,19 @@ override_dh_clean:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-       @echo "===> Running tests"
-       set -e ; set -x ; for i in 2.7 ; do \
-               PYMAJOR=`echo $$i | cut -d'.' -f1` ; \
-               echo "===> Testing with python$$i (python$$PYMAJOR)" ; \
-               rm -rf .testrepository ; \
-               testr-python$$PYMAJOR init ; \
-               TEMP_REZ=`mktemp -t` ; \
-               PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit 'neutron\.tests\.unit.*' | tee $$TEMP_REZ | subunit2pyunit ; \
-               cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
-               rm -f $$TEMP_REZ ; \
-               testr-python$$PYMAJOR slowest ; \
-       done
+       python2-ostestr --pretty --color --slowest
+#      @echo "===> Running tests"
+#      set -e ; set -x ; for i in 2.7 ; do \
+#              PYMAJOR=`echo $$i | cut -d'.' -f1` ; \
+#              echo "===> Testing with python$$i (python$$PYMAJOR)" ; \
+#              rm -rf .testrepository ; \
+#              testr-python$$PYMAJOR init ; \
+#              TEMP_REZ=`mktemp -t` ; \
+#              PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit 'neutron\.tests\.unit.*' | tee $$TEMP_REZ | subunit2pyunit ; \
+#              cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
+#              rm -f $$TEMP_REZ ; \
+#              testr-python$$PYMAJOR slowest ; \
+#      done
        #PYTHONPATH=build/* ./run_tests.sh -N -P
 endif