From bf4e34c1afe12985a699e309717ca4f85890586c Mon Sep 17 00:00:00 2001
From: Pablo Greco <pgreco@centosproject.org>
Date: Jul 28 2019 18:05:40 +0000
Subject: Fix dovecot tests in CentOS8


---

diff --git a/tests/p_dovecot/1-config_dovecot.sh b/tests/p_dovecot/1-config_dovecot.sh
index 70818bf..43b4b11 100755
--- a/tests/p_dovecot/1-config_dovecot.sh
+++ b/tests/p_dovecot/1-config_dovecot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Author: Athmane Madjoudj <athmanem@gmail.com>
 
-if (t_GetPkgRel dovecot | egrep -q 'el6|7')
+if (t_GetPkgRel dovecot | egrep -q 'el6|7|8')
 then
    t_Log "Running $0 - Configuration of Dovecot"
 
diff --git a/tests/p_dovecot/dovecot_imap_login.sh b/tests/p_dovecot/dovecot_imap_login.sh
index b486eca..949d34c 100755
--- a/tests/p_dovecot/dovecot_imap_login.sh
+++ b/tests/p_dovecot/dovecot_imap_login.sh
@@ -16,7 +16,7 @@ t_Log "Dovecot IMAP login test"
 
 # EL7 comes with nmap-nc , different from nc so different options to use
 
-if [ "$centos_ver" = "7" ];then
+if [ "$centos_ver" -ge 7 ];then
  nc_options="-d 3 -w 5"
 else
  nc_options="-i 3 -w 5"
diff --git a/tests/p_dovecot/dovecot_pop3_login.sh b/tests/p_dovecot/dovecot_pop3_login.sh
index a12056e..0ce53fc 100755
--- a/tests/p_dovecot/dovecot_pop3_login.sh
+++ b/tests/p_dovecot/dovecot_pop3_login.sh
@@ -13,7 +13,7 @@ chown -R pop3test:pop3test /home/pop3test/mail/.imap/INBOX
 t_Log "Dovecot POP3 login test"
 # EL7 comes with nmap-nc , different from nc so different options to use
 
-if [ "$centos_ver" = "7" ];then
+if [ "$centos_ver" -ge 7 ];then
  nc_options="-d 3 -w 5"
 else
  nc_options="-i 3 -w 5"