From 428518760b0d447d3a0b1979fa1123cc611a3f21 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Feb 06 2019 15:41:30 +0000 Subject: [PATCH 1/2] Enable nosetests-2, nosetests-3 on CentOS-7 CentOS 7 doesn't have /usr/bin/nosetests-{2,3}, only /usr/bin/nosetests-{2.7,3.4} Check if those exist and use them Signed-off-by: Karsten Hopp --- diff --git a/runtests.py b/runtests.py index 7e25ee6..12a1aa2 100755 --- a/runtests.py +++ b/runtests.py @@ -16,8 +16,14 @@ import time RUNNER_PY = "nosetests" -RUNNER_PY2 = "nosetests-2" -RUNNER_PY3 = "nosetests-3" +if os.path.isfile("/usr/bin/nosetests-2.7"): + RUNNER_PY2 = "nosetests-2.7" +else: + RUNNER_PY2 = "nosetests-2" +if os.path.isfile("/usr/bin/nosetests-3.4"): + RUNNER_PY3 = "nosetests-3.4" +else: + RUNNER_PY3 = "nosetests-3" COVER_PY = "coverage" COVER_PY2 = "coverage2" COVER_PY3 = "coverage3" From e4bd331fc5f9425da7d8e43a70935f4420c2ee19 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Feb 06 2019 15:57:15 +0000 Subject: [PATCH 2/2] install nosetests Signed-off-by: Karsten Hopp --- diff --git a/run_ci_tests.sh b/run_ci_tests.sh index a8e1fba..f7326cc 100755 --- a/run_ci_tests.sh +++ b/run_ci_tests.sh @@ -18,6 +18,7 @@ yum install -y python-virtualenv python34 python34-devel \ python2-fedmsg python34-fedmsg-core fedmsg \ python-tox python-pip python34-pip \ parallel zeromq-devel python-Cython \ + python34-nose python-nose \ repoSpanner repoSpanner-bridge sysctl -w fs.file-max=2048