From 04f9be69e5490229a38b645938cb78fd8fa8a04d Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Wed, 14 Dec 2016 19:17:53 +0100 Subject: [PATCH] tests: fix test-setup.sh tox doesn't have quiet option, so we have to create the virtualenv first and run bindep manually. Change-Id: I3ae76278391baa5cd80202f32ad88b1368b0f16d --- tools/test-setup.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/test-setup.sh b/tools/test-setup.sh index e08a2d085..abb2540ba 100755 --- a/tools/test-setup.sh +++ b/tools/test-setup.sh @@ -18,8 +18,13 @@ if [ "${JOB_NAME//gate-oslo.messaging-tox-py*-func-/}" == "${JOB_NAME}" ]; then exit 0 fi +# NOTE(sileht): we create the virtualenv only and use bindep directly +# because tox doesn't have a quiet option... +tox -ebindep --notest + +# NOTE(sileht): bindep return 1 if some packages have to be installed BINDEP_PROFILE=$(echo $JOB_NAME | cut -d- -f6) -PACKAGES=$(tox -e bindep -- -b -f bindep.txt $BINDEP_PROFILE) +PACKAGES=$(.tox/bindep/bin/bindep -b -f bindep.txt $BINDEP_PROFILE || true) # inspired from project-config install-distro-packages.sh if apt-get -v >/dev/null 2>&1 ; then