Nir Soffer has uploaded a new change for review. Change subject: tests: Ensure nose 1.3.7 is used for tests ......................................................................
tests: Ensure nose 1.3.7 is used for tests Run the tests via tox, installing the correct version of nose in a virtual environment. Since correct version is nose is always available, the warning about nose version is not needed now. Change-Id: I245a171940a5e869fd719a6410024ee77e8ad86c Signed-off-by: Nir Soffer <[email protected]> --- M Makefile.am M automation/check-patch.sh M tox.ini 3 files changed, 9 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/65404/1 diff --git a/Makefile.am b/Makefile.am index 354c6b3..3b3e11c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -131,12 +131,7 @@ .PHONY: tests tests: - @version=`nosetests --version | cut -d' ' -f3`; \ - if build-aux/vercmp $$version "1.3.7"; then \ - echo "Error: NOSE is too old, please install NOSE 1.3.7 or later"; \ - exit 1; \ - fi - @$(MAKE) -C tests/ check + tox -e tests all-local: \ vdsm.spec diff --git a/automation/check-patch.sh b/automation/check-patch.sh index 3284e2b..0877046 100755 --- a/automation/check-patch.sh +++ b/automation/check-patch.sh @@ -8,7 +8,7 @@ export VDSM_AUTOMATION=1 easy_install pip -pip install -U nose==1.3.7 tox==2.1.1 +pip install -U tox==2.1.1 ./autogen.sh --system --enable-hooks --enable-vhostmd diff --git a/tox.ini b/tox.ini index 8686eb2..fb86cb7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,13 @@ [tox] -envlist = flake8 +envlist = flake8,tests skipsdist = true +[testenv:tests] +deps = + nose==1.3.7 +commands = + make -C tests check + [testenv:flake8] deps = flake8 -- To view, visit https://gerrit.ovirt.org/65404 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I245a171940a5e869fd719a6410024ee77e8ad86c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <[email protected]> _______________________________________________ vdsm-patches mailing list -- [email protected] To unsubscribe send an email to [email protected]
