From: Garrett C. <yan...@gm...> - 2010-04-15 08:34:10
|
On Wed, Apr 14, 2010 at 11:51 PM, Rishikesh K Rajak <ris...@li...> wrote: > On Thu, Apr 15, 2010 at 11:30:45AM +0900, Mitani wrote: >> Sorry. >> My patch was destroyed by e-mail. >> I attach patch for "mail_tests.sh" file. > > Applied to next branch. Will wait for someone to Acked/test it before merging to > master. > > Thanks > -Rishi >> >> >> Signed-off-by: Tomonori Mitani <mi...@ry...> >> >> >> Regards-- >> >> -Tomonori Mitani >> >> > -----Original Message----- >> > From: Rishikesh K Rajak [mailto:ris...@li...] >> > Sent: Thursday, April 01, 2010 3:57 PM >> > To: Mitani >> > Cc: ltp...@li... >> > Subject: Re: [LTP] About mail test >> > >> > >> > Hi Mitani, >> > >> > can you please sign off ? And also send me a patch against today's git. >> > >> > -Rishi >> > >> > On Tue, Mar 30, 2010 at 10:57:49AM +0900, Mitani wrote: >> > > Hi, >> > > >> > > I found two problems in mail test. >> > > (${LTPROOT}/testcases/commands/mail/mail_tests.sh) >> > > They are simple mistakes, I think. >> > > >> > > 1) About judgment for making a user name >> > > In line 80 of "mail_tests.sh", there is following sentence. >> > > ------------ >> > > if id -u mail_test >/dev/null 2>&1; then >> > > ------------ >> > > This control sentence is going to judge whether the result of >> > > "id -u mail_test" command is normal or not, I think. >> > > But this sentence is not effective. >> > > Therefore the user name "make_test" cannot be made when this user >> > name >> > > isn't exist. >> > > >> > > >> > > 2) About "blind carbon copy" option >> > > In "mail_tests.sh", there are 5 tests about mail. >> > > 5th is "blind carbon copy" test. >> > > However, this test doesn't use "-b" option but uses "-c" option. >> > > >> > > >> > > Please consider the following revision. >> > > ============ >> > > --- ./testcases/commands/mail/mail_tests.sh 2010-03-23 >> > > 17:56:21.000000000 +0900 >> > > +++ ./testcases/commands/mail/mail_tests.sh.new 2010-03-30 >> > > 10:39:40.000000000 +0900 >> > > @@ -77,7 +77,8 @@ >> > > >> > > # check if the user mail_test exists on this system. >> > > # if not add that user mail_test, will removed before exiting test. >> > > -if id -u mail_test >/dev/null 2>&1; then >> > > +id -u mail_test >/dev/null 2>&1 >> > > +if [ $? -ne 0 ] ; then >> > > tst_resm TINFO "INIT: Adding temporary user mail_test" >> > > useradd -m -s /sbin/nologin mail_test > >> > $LTPTMP/tst_mail.out 2>&1 >> > > if [ $? -ne 0 ]; then >> > > @@ -327,7 +328,7 @@ >> > > tst_resm TINFO "Test #5: blind carbon copy user@domain" >> > > >> > > # send mail to root and carbon copy mail_test >> > > -mail -s "Test" root@localhost -c mail_test@localhost < \ >> > > +mail -s "Test" root@localhost -b mail_test@localhost < \ >> > > $LTPTMP/tst_mail.in > $LTPTMP/tst_mail.out 2>&1 >> > > if [ $? -ne 0 ]; then >> > > tst_res TFAIL $LTPTMP/tst_mail.out \ >> > > @@ -344,10 +345,10 @@ >> > > >> > > if [ "x$RC1" != x0 -a "x$RC2" != x0 ]; then >> > > tst_resm TPASS \ >> > > - "Test #5: Mail was carbon copied to user >> > mail_test" >> > > + "Test #5: Mail was blind carbon copied to user >> > > mail_test" >> > > else >> > > tst_res TFAIL $LTPTMP/tst_mail.res \ >> > > - "Test #5: mail failed to carbon copy user >> > mail_test. >> > > Reason:" >> > > + "Test #5: mail failed to blind carbon copy user >> > > mail_test. Reason:" >> > > : $(( TFAILCNT += 1 )) >> > > fi >> > > >> > > ============ Apart from the comment above the BCC test being incorrect, everything looks fine. Acked-by: Garrett Cooper <yan...@gm...> -Garrett |