From 8b349cb50c5f2b08a10c56a8844ce37dc7a55720 Mon Sep 17 00:00:00 2001
From: Fabian Arrotin <fabian.arrotin@arrfab.net>
Date: Mar 14 2019 07:52:19 +0000
Subject: Merge pull request #32 from masami256/enable-tests-on-el7


LGTM, merging .. thanks ! 
---

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 <athmanem@gmail.com>
 
-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
diff --git a/tests/p_rrdtool/0-install_rrdtool.sh b/tests/p_rrdtool/0-install_rrdtool.sh
index 56b9e3d..3614363 100755
--- a/tests/p_rrdtool/0-install_rrdtool.sh
+++ b/tests/p_rrdtool/0-install_rrdtool.sh
@@ -2,7 +2,7 @@
 # Author: Christoph Galuschka <christoph.galuschka@chello.at>
 #         Athmane Madjoudj <athmanem@gmail.com>
 
-if (t_GetPkgRel basesystem | grep -q el6)
+if [ $centos_ver -ge 6 ]
 then
     # Install rrdtool
     t_InstallPackage rrdtool
diff --git a/tests/p_rrdtool/rrdtool_test.sh b/tests/p_rrdtool/rrdtool_test.sh
index 83094cb..f04654d 100755
--- a/tests/p_rrdtool/rrdtool_test.sh
+++ b/tests/p_rrdtool/rrdtool_test.sh
@@ -3,7 +3,7 @@
 # Author: Christoph Galuschka <christoph.galuschka@chello.at>
 # RRD-sample from http://oss.oetiker.ch/rrdtool/doc/rrdcreate.en.html
 
-if (t_GetPkgRel basesystem | grep -q el6)
+if [ $centos_ver -ge 6 ]
 then
     t_Log "Running $0 - rrdtool: create rrd, write values and retrieve values test."