From fb6d8c9dca0dd146001640b50d7edd766d786cc4 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 13 Jun 2016 09:02:49 +0200 Subject: [PATCH] Using testr directly, not using ./run_tests.sh anymore. Rewritten-From: 53cb89648f744757eeef384c44ec5030b14e48b3 --- xenial/debian/changelog | 1 + xenial/debian/rules | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 43a467b77..551a710bc 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -7,6 +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. -- Thomas Goirand Thu, 09 Jun 2016 00:59:14 +0200 diff --git a/xenial/debian/rules b/xenial/debian/rules index b1438d454..aad9357f0 100755 --- a/xenial/debian/rules +++ b/xenial/debian/rules @@ -173,7 +173,19 @@ override_dh_clean: override_dh_auto_test: ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) - PYTHONPATH=build/* ./run_tests.sh -N -P + @echo "===> Running tests" + set -e ; set -x ; for i in 2.7 $(PYTHON3S) ; 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 override_dh_auto_build: -- 2.45.2