From bcf34984b642f20f1a270708dd24d687bf285046 Mon Sep 17 00:00:00 2001 From: Karanbir Singh Date: Nov 09 2012 08:40:25 +0000 Subject: skip the ssh interactive test if password logins are disabled --- diff --git a/tests/p_openssh/sshd_user_login.sh b/tests/p_openssh/sshd_user_login.sh index 5a962e8..b637664 100755 --- a/tests/p_openssh/sshd_user_login.sh +++ b/tests/p_openssh/sshd_user_login.sh @@ -6,12 +6,12 @@ userdel -rf sshtest; useradd sshtest && echo sshtest | passwd --stdin sshtest # Create a test file touch /home/sshtest/ssh_test_file -t_Log "Running $0 - SSH user login test." - -./tests/p_openssh/_helper_sshd_user_login.expect | grep "ssh_test_file" - > /dev/null 2>&1 - -t_CheckExitStatus $? - -userdel -rf sshtest +t_Log "Running $0 - SSH Interactive user login test." +if [ `egrep "^PasswordAuthentication" /etc/ssh/sshd_config | tail -n1 | egrep "\syes$" | wc -l ` -gt 0 ] + ./tests/p_openssh/_helper_sshd_user_login.expect | grep "ssh_test_file" > /dev/null 2>&1 + t_CheckExitStatus $? + userdel -rf sshtest +else + t_Log 'Skipped' +fi