From 957a2d559394fd7f70aae86118d0001d74f142f2 Mon Sep 17 00:00:00 2001 From: Masami Ichikawa Date: Mar 14 2019 00:45:42 +0000 Subject: Enable mod_wsgi test on el7 This test skipped on el7, so enable it on el7. --- diff --git a/tests/p_mod_wsgi/0-install_mod_wsgi.sh b/tests/p_mod_wsgi/0-install_mod_wsgi.sh index 0f9de2f..1713b67 100755 --- a/tests/p_mod_wsgi/0-install_mod_wsgi.sh +++ b/tests/p_mod_wsgi/0-install_mod_wsgi.sh @@ -1,7 +1,7 @@ #!/bin/bash # Author: Athmane Madjoudj -if (t_GetPkgRel basesystem | grep -q el6) +if [ $centos_ver -ge 6 ] then t_InstallPackage mod_wsgi service httpd restart diff --git a/tests/p_mod_wsgi/mod_wsgi_test.sh b/tests/p_mod_wsgi/mod_wsgi_test.sh index 65a049f..88857a3 100755 --- a/tests/p_mod_wsgi/mod_wsgi_test.sh +++ b/tests/p_mod_wsgi/mod_wsgi_test.sh @@ -1,7 +1,8 @@ #!/bin/sh t_Log "Running $0 - Apache httpd mod_wsgi is functional" -if (t_GetPkgRel basesystem | grep -q el6); then +if [ $centos_ver -ge 6 ] +then while [ `ps fax | grep 'sbin/httpd' | grep -v grep | wc -l` -gt 0 ]; do #t_ServiceControl httpd stop killall -s KILL httpd