From 0b22f53921f53d69244526862168ab4cc7774221 Mon Sep 17 00:00:00 2001
From: Karanbir Singh <kbsingh@karan.org>
Date: Nov 05 2012 15:44:24 +0000
Subject: Merge branch 'master' of gitorious.org:testautomation/t_functional


---

diff --git a/tests/p_dovecot/dovecot_imap_login.sh b/tests/p_dovecot/dovecot_imap_login.sh
index 94b4891..e74f1b9 100755
--- a/tests/p_dovecot/dovecot_imap_login.sh
+++ b/tests/p_dovecot/dovecot_imap_login.sh
@@ -8,21 +8,21 @@ t_Log "Running $0 - adding imaptest local user account + attempting IMAP login"
 
 # creating maildir in HOME, else test will fail at first try
 mkdir -m 700 -p /home/imaptest/mail/.imap/INBOX 
-chown -R imaptest:imaptest /home/imaptest/mail/.imap/INBOX
+chown -R imaptest:imaptest /home/imaptest/mail
 
 ret_val=1
 
 t_Log "Dovecot IMAP login test"
+# after a restart of dovecot this always results with
+# 'imap-login: Disconnected (no auth attempts)' in /var/log/maillog
+# first try will be ignored
 echo -e "01 LOGIN imaptest imaptest\n" | nc -w 5 localhost 143 | grep -q "Logged in."
-ret_val=$?
 
-if [ $ret_val == 1 ]
-  then
-  t_Log "Sometimes the first login fails (reason yet unknown to me)"
-  t_Log "Trying a second time, as this seems to work, if not somethings really not working"
-  echo -e "01 LOGIN imaptest imaptest\n" | nc -w 5 localhost 143 | grep -q "Logged in."
-  ret_val=$?
-fi
+# and we need some time between login attempts
+sleep 3
+
+echo -e "01 LOGIN imaptest imaptest\n" | nc -w 5 localhost 143 | grep -q "Logged in."
+ret_val=$?
 
 t_CheckExitStatus $ret_val
 
diff --git a/tests/p_lftp/10_lftp_http_test.sh b/tests/p_lftp/10_lftp_http_test.sh
index b3d10aa..3727c8b 100755
--- a/tests/p_lftp/10_lftp_http_test.sh
+++ b/tests/p_lftp/10_lftp_http_test.sh
@@ -12,7 +12,7 @@ if [ $SKIP_QA_HARNESS ]; then
   FILE="timestamp.txt"
 else
   CHECK_FOR="CentOS"
-  URL="http://repo.centos.qa/CentOS/6/os/x86_64/"
+  URL="http://repo.centos.qa/srv/CentOS/6/os/x86_64/"
   FILE="RELEASE-NOTES-en-US.html"
 fi
 
diff --git a/tests/p_squirrelmail/0-install_squirrelmail.sh b/tests/p_squirrelmail/0-install_squirrelmail.sh
index 941e3dd..6905b5a 100755
--- a/tests/p_squirrelmail/0-install_squirrelmail.sh
+++ b/tests/p_squirrelmail/0-install_squirrelmail.sh
@@ -4,6 +4,7 @@
 # NOTE: squirrelmail rpm has require: httpd php php-mbstring
 # Squirellmail has been removed from el6
 
+t_Log "Running $0 - install squirrelmail"
 if (t_GetPkgRel basesystem | grep -q el6)
 then
    t_Log It seems to be a CentOS 6.x system, this test will be disabled
diff --git a/tests/p_squirrelmail/squirrelmail_test.sh b/tests/p_squirrelmail/squirrelmail_test.sh
index 7a386ae..c590be8 100755
--- a/tests/p_squirrelmail/squirrelmail_test.sh
+++ b/tests/p_squirrelmail/squirrelmail_test.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 # Author: Athmane Madjoudj <athmanem@gmail.com>
+t_Log "Running $0 - test SquirrelMail URL"
+
 if (t_GetPkgRel basesystem | grep -q el6)
 then
    t_Log It seems to be a CentOS 6.x system, this test will be disabled
 else
-   t_Log "Running $0 - test SquirrelMail URL."
    curl -s http://localhost/webmail/src/login.php | grep 'SquirrelMail' > /dev/null 2>&1
 fi