From eb8570b47545b9911f3b8ded62468d0aa5689550 Mon Sep 17 00:00:00 2001 From: Christoph Galuschka Date: Nov 18 2012 14:06:49 +0000 Subject: made vsftpd tests less verbose (added -q to grep) --- diff --git a/tests/p_vsftpd/vsftpd_anonymous_login.sh b/tests/p_vsftpd/vsftpd_anonymous_login.sh index ad26f35..0a04a6f 100755 --- a/tests/p_vsftpd/vsftpd_anonymous_login.sh +++ b/tests/p_vsftpd/vsftpd_anonymous_login.sh @@ -3,6 +3,6 @@ t_Log "Running $0 - vsFTPd anonymous can login test." -echo -e "user anonymous\npass password\nquit" | nc localhost 21 | grep "230 Login successful." +echo -e "user anonymous\npass password\nquit" | nc localhost 21 | grep -q "230 Login successful." t_CheckExitStatus $? diff --git a/tests/p_vsftpd/vsftpd_localusers_login.sh b/tests/p_vsftpd/vsftpd_localusers_login.sh index d2abce1..ca122c8 100755 --- a/tests/p_vsftpd/vsftpd_localusers_login.sh +++ b/tests/p_vsftpd/vsftpd_localusers_login.sh @@ -9,7 +9,7 @@ t_Log "Running $0 - vsFTPd local user can login test." # Fix SELinux boolean setsebool ftp_home_dir 1 -echo -e "user ftptest\npass ftptest\nquit" | nc localhost 21 | grep "230 Login successful." +echo -e "user ftptest\npass ftptest\nquit" | nc localhost 21 | grep -q "230 Login successful." t_CheckExitStatus $?