From 2844c1a89666356f7aa9c4e11c5284ebe44a6ad0 Mon Sep 17 00:00:00 2001 From: Christoph Galuschka Date: May 12 2012 20:16:54 +0000 Subject: fix for MTA-tests on C5 --- diff --git a/tests/p_postfix/0-install_postfix.sh b/tests/p_postfix/0-install_postfix.sh index 13f8ff2..38a14e3 100755 --- a/tests/p_postfix/0-install_postfix.sh +++ b/tests/p_postfix/0-install_postfix.sh @@ -3,5 +3,16 @@ # Postfix t_InstallPackage postfix + +# Removing other MTA +t_ServiceControl sendmail stop +sleep 3 t_RemovePackage sendmail +if (t_GetPkgRel basesystem | grep -q el5) +then + t_ServiceControl exim stop + sleep 3 + t_RemovePackage exim +fi + t_ServiceControl postfix start diff --git a/tests/p_sendmail/0-install_sendmail.sh b/tests/p_sendmail/0-install_sendmail.sh index 2d3d71c..8d072a0 100755 --- a/tests/p_sendmail/0-install_sendmail.sh +++ b/tests/p_sendmail/0-install_sendmail.sh @@ -7,5 +7,12 @@ t_InstallPackage sendmail t_ServiceControl postfix stop sleep 3 t_RemovePackage postfix +if (t_GetPkgRel basesystem | grep -q el5) +then + #also stoping/removing exim + t_ServiceControl exim stop + sleep 3 + t_RemovePackage exim +fi t_ServiceControl sendmail start