Return-Path: Received: from sfi-mx-2.v28.ch3.sourceforge.com ([172.29.28.122] helo=mx.sourceforge.net) by 3yr0jf1.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1N9wiq-0006de-DI for ltp-list@lists.sourceforge.net; Mon, 16 Nov 2009 08:14:04 +0000 Received: from e32.co.us.ibm.com ([32.97.110.150]) by 72vjzd1.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1N9wik-0003yv-48 for ltp-list@lists.sourceforge.net; Mon, 16 Nov 2009 08:14:04 +0000 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e32.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id nAG88bi4029148 for ; Mon, 16 Nov 2009 01:08:37 -0700 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id nAG8Do4l032330 for ; Mon, 16 Nov 2009 01:13:51 -0700 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id nAG8DoAm020125 for ; Mon, 16 Nov 2009 01:13:50 -0700 From: Subrata Modak In-Reply-To: <4AFCB13D.9040203@cn.fujitsu.com> References: <4AF137E8.3090408@cn.fujitsu.com> <4AFCB13D.9040203@cn.fujitsu.com> Date: Mon, 16 Nov 2009 13:43:42 +0530 Message-Id: <1258359222.5677.34.camel@subratamodak.linux.ibm.com> Mime-Version: 1.0 Subject: Re: [LTP] [PATCH] mail: fix the bug of mail01 Reply-To: subrata@linux.vnet.ibm.com List-Id: Linux Test Project General Discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-list-bounces@lists.sourceforge.net To: liubo Cc: ltp-list@lists.sourceforge.net On Fri, 2009-11-13 at 09:07 +0800, liubo wrote: > Hi, Subrata, > > On 11/04/2009 04:14 PM, liubo wrote: > > In the testcase "mail01", > > > > when mail is send to nosuchuser@domain > > and mail is send to user@nosuchdomain, > > mail program may return either "Returnedmail:" > > or "UndeliveredMailReturned", regardless of > > the existence of /etc/redhat-release. > > > > So, we did a bit of changes to recongnize both of > > returned values. > > > > This patch fixes the problem. > > > > Signed-off-by: Liu Bo > > > > Is there any problem about this patch? Hey, i missed this. Not able to find it in my mailbox also. Can you please resend it ? Regards-- Subrata > > > --- > > testcases/commands/mail/mail_tests.sh | 65 ++++++++++++++++----------------- > > 1 files changed, 31 insertions(+), 34 deletions(-) > > > > diff --git a/testcases/commands/mail/mail_tests.sh b/testcases/commands/mail/mail_tests.sh > > index 45bac93..024120f 100755 > > --- a/testcases/commands/mail/mail_tests.sh > > +++ b/testcases/commands/mail/mail_tests.sh > > @@ -172,28 +172,27 @@ else > > echo "d" | mail -u root > $LTPTMP/tst_mail.res 2>&1 > > RC1=$(awk '/^>N/ {IGNORECASE=1; print match($3, "Mailer-Daemon")}' \ > > $LTPTMP/tst_mail.res) > > - RC2=$(awk '/^>N/ {print match($9 $10 $11, "Maildeliveryfailed:")}' \ > > - $LTPTMP/tst_mail.res) > > -##### > > -# Some mailers (e.g., Red Hat's sendmail) print different messages > > -##### > > -if [ -f /etc/redhat-release ] > > -then > > - [ -z "$RC2" -o "X$RC2" = "X0" ] && \ > > +################################################################## > > +# In this testcase, mail will get "Returnedmail:", while mailx will > > +# get "UndeliveredMailReturned:". > > +# Either of mail and mailx may be linked to another. > > +# For example, > > +# /bin/mail -> /bin/mailx > > +# or > > +# /bin/mailx -> /bin/mail > > +################################################################## > > RC2=$(awk '/^>N/ {print match($9 $10, "Returnedmail:")}' \ > > $LTPTMP/tst_mail.res) > > -else > > - [ -z "$RC2" -o "X$RC2" = "X0" ] && \ > > - RC2=$(awk '/^>N/ {print match($9 $10 $11, "UndeliveredMailReturned")}' \ > > + RC3=$(awk '/^>N/ {print match($9 $10, "UndeliveredMail")}' \ > > $LTPTMP/tst_mail.res) > > fi > > - if [ -z "$RC1" -a -z "$RC2" ] > > + if [ -z "$RC1" -a -z "$RC2" -a -z "$RC3" ] > > then > > $LTPBIN/tst_res TFAIL $LTPTMP/tst_mail.res \ > > "Test #2: No new mail for root. Reason:" > > TFAILCNT=$(( $TFAILCNT+1 )) > > else > > - if [ $RC1 -ne 0 -a $RC2 -ne 0 ] > > + if [ $RC1 -ne 0 -a $RC2 -ne 0 ] || [ $RC1 -ne 0 -a $RC3 -ne 0 ] > > then > > $LTPBIN/tst_resm TPASS \ > > "Test #2: Mailer-Deamon reported delivery failure" > > @@ -203,7 +202,6 @@ fi > > TFAILCNT=$(( $TFAILCNT+1 )) > > fi > > fi > > -fi > > else > > $LTPBIN/tst_resm TCONF "mail command not installed" > > fi > > @@ -242,29 +240,28 @@ else > > echo "d" | mail -u root > $LTPTMP/tst_mail.res 2>&1 > > RC1=$(awk '/^>N/ {IGNORECASE=1; print match($3, "Mailer-Daemon")}' \ > > $LTPTMP/tst_mail.res) > > - RC2=$(awk '/^>N/ {print match($9 $10 $11, "Maildeliveryfailed:")}' \ > > - $LTPTMP/tst_mail.res) > > -##### > > -# Some mailers (e.g., Red Hat's sendmail) print different messages > > -##### > > -if [ -f /etc/redhat-release ] > > -then > > - [ -z "$RC2" -o "X$RC2" = "X0" ] && \ > > - RC2=$(awk '/^>N/ {print match($9 $10, "Returnedmail:")}' \ > > - $LTPTMP/tst_mail.res) > > -else > > - [ -z "$RC2" -o "X$RC2" = "X0" ] && \ > > - RC2=$(awk '/^>N/ {print match($9 $10 $11, "UndeliveredMailReturned")}' \ > > - $LTPTMP/tst_mail.res) > > -fi > > - if [ -z "$RC1" -a -z "$RC2" ] > > +################################################################## > > +# In this testcase, mail will get "Returnedmail:", while mailx will > > +# get "UndeliveredMailReturned:". > > +# Either of mail and mailx may be linked to another. > > +# For example, > > +# /bin/mail -> /bin/mailx > > +# or > > +# /bin/mailx -> /bin/mail > > +################################################################## > > + RC2=$(awk '/^>N/ {print match($9 $10, "Returnedmail:")}' \ > > + $LTPTMP/tst_mail.res) > > + RC3=$(awk '/^>N/ {print match($9 $10, "UndeliveredMail")}' \ > > + $LTPTMP/tst_mail.res) > > +fi > > + if [ -z "$RC1" -a -z "$RC2" -a -z "$RC3" ] > > then > > $LTPBIN/tst_res TFAIL $LTPTMP/tst_mail.res \ > > - "Test #3: No new mail for root. Reason:" > > + "Test #2: No new mail for root. Reason:" > > TFAILCNT=$(( $TFAILCNT+1 )) > > else > > - if [ $RC1 -ne 0 -a $RC2 -ne 0 ] > > - then > > + if [ $RC1 -ne 0 -a $RC2 -ne 0 ] || [ $RC1 -ne 0 -a $RC3 -ne 0 ] > > + then > > $LTPBIN/tst_resm TPASS \ > > "Test #3: Mailer-Deamon reported delivery failure" > > else > > @@ -273,7 +270,7 @@ fi > > TFAILCNT=$(( $TFAILCNT+1 )) > > fi > > fi > > -fi > > + > > else > > $LTPBIN/tst_resm TCONF "mail command not installed" > > fi > > > ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Ltp-list mailing list Ltp-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ltp-list