[LTP] fix mail_tests for systems without mail installed

Paul Larson
2009-08-12T21:14:28Z

[-- Attachment #1: Type: text/plain, Size: 135 bytes --]

mail_tests should return tconf instead of tfail if mail is not installed.

Signed-off-by: Paul Larson <paul.larson@canonical.com>
---

[-- Attachment #2: mail_tests.patch --]
[-- Type: text/x-patch, Size: 2954 bytes --]

diff --git a/testcases/commands/mail/mail_tests.sh b/testcases/commands/mail/mail_tests.sh
index 7458944..a2c6487 100755
--- a/testcases/commands/mail/mail_tests.sh
+++ b/testcases/commands/mail/mail_tests.sh
@@ -59,6 +59,11 @@ RC=0
export TCID=SETUP
export TST_COUNT=1

+`which mail`
+if [ $? != 0 ]; then
+ MAIL_NOT_INSTALLED=1
+fi
+
# check if the user mail_test exists on this system.
# if not add that user mail_test, will removed before exiting test.
RC=$(awk '/^mail_test/ {print 1}' /etc/passwd)
@@ -97,6 +102,7 @@ $LTPBIN/tst_resm TINFO "Test #1: mail root@localhost will send mail to root"
$LTPBIN/tst_resm TINFO "Test #1: user on local machine."

+if [ -z $MAIL_NOT_INSTALLED ]; then
cat > $LTPTMP/tst_mail.in <<EOF
This is a test email.
EOF
@@ -125,6 +131,9 @@ else
TFAILCNT=$(( $TFAILCNT+1 ))
fi
fi
+else
+ $LTPBIN/tst_resm TCONF "mail command not installed"
+fi

# Test #2
@@ -142,6 +151,7 @@ $LTPBIN/tst_resm TINFO \
$LTPBIN/tst_resm TINFO "Test #2: to deliver the mail. Mailer daemon should"
$LTPBIN/tst_resm TINFO "Test #2: report this failure."

+if [ -z $MAIL_NOT_INSTALLED ]; then
cat > $LTPTMP/tst_mail.in <<EOF
This is a test email.
EOF
@@ -193,7 +203,9 @@ fi
fi
fi
fi
-
+else
+ $LTPBIN/tst_resm TCONF "mail command not installed"
+fi

# Test #3
# Test that mail non_existant_user@localhost will result in delivery failure.
@@ -210,6 +222,7 @@ $LTPBIN/tst_resm TINFO \
$LTPBIN/tst_resm TINFO "Test #3: to deliver the mail. Mailer daemon should"
$LTPBIN/tst_resm TINFO "Test #3: report this failure."

+if [ -z $MAIL_NOT_INSTALLED ]; then
cat > $LTPTMP/tst_mail.in <<EOF
This is a test email.
EOF
@@ -260,6 +273,9 @@ fi
fi
fi
fi
+else
+ $LTPBIN/tst_resm TCONF "mail command not installed"
+fi

# Test #4
# Test that mail -c user@domain option will carbon copy that user.
@@ -270,6 +286,7 @@ RC=0

$LTPBIN/tst_resm TINFO "Test #4: Test that mail -c user@domain will"
$LTPBIN/tst_resm TINFO "Test #4: carbon copy user@domain"
+if [ -z $MAIL_NOT_INSTALLED ]; then

# send mail to root and carbon copy mail_test
mail -s "Test" root@localhost -c mail_test@localhost < \
@@ -297,7 +314,9 @@ else
TFAILCNT=$(( $TFAILCNT+1 ))
fi
fi
-
+else
+ $LTPBIN/tst_resm TCONF "mail command not installed"
+fi

# Test #5
# Test that mail -b user@domain option will blind carbon copy that user.
@@ -308,6 +327,7 @@ RC=0

$LTPBIN/tst_resm TINFO "Test #5: Test that mail -b user@domain will"
$LTPBIN/tst_resm TINFO "Test #5: blind carbon copy user@domain"
+if [ -z $MAIL_NOT_INSTALLED ]; then

# send mail to root and carbon copy mail_test
mail -s "Test" root@localhost -c mail_test@localhost < \
@@ -335,7 +355,9 @@ else
TFAILCNT=$(( $TFAILCNT+1 ))
fi
fi
-
+else
+ $LTPBIN/tst_resm TCONF "mail command not installed"
+fi

#CLEANUP & EXIT
# remove all the temporary files created by this test.

[-- Attachment #3: Type: text/plain, Size: 355 bytes --]

------------------------------------------------------------------------------
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

[-- Attachment #4: Type: text/plain, Size: 155 bytes --]