From c75df330c738d08f355265e83eff62102cbe3649 Mon Sep 17 00:00:00 2001
From: Fabian Arrotin <arrfab@centos.org>
Date: May 19 2014 18:52:00 +0000
Subject: Fixed the expect script for the p_passwd test (different lines)


---

diff --git a/tests/p_lynx/lynx_dump_page_test.sh b/tests/p_lynx/lynx_dump_page_test.sh
index 15a2fc8..0f5de17 100755
--- a/tests/p_lynx/lynx_dump_page_test.sh
+++ b/tests/p_lynx/lynx_dump_page_test.sh
@@ -3,7 +3,7 @@
 
 t_Log "Running $0 - check that lynx can dump remote page."
 
-if [ $SKIP_QA_HARNESS -eq 1 ]; then
+if [ "$SKIP_QA_HARNESS" = "1" ] ; then
   URL="http://ci.dev.centos.org/cstatic/"
   CHECK_FOR="CentOS CI test page"
 else
diff --git a/tests/p_passwd/_password_complexity.expect b/tests/p_passwd/_password_complexity.expect
index 6b73c62..d0babe4 100755
--- a/tests/p_passwd/_password_complexity.expect
+++ b/tests/p_passwd/_password_complexity.expect
@@ -12,10 +12,13 @@ expect {
     "password:" {
          send "$testpassword\r"
          expect {
+             "BAD PASSWORD: is a palindrome" { exit 0 }
+             "BAD PASSWORD: The password is a palindrome" { exit 0 }
              "BAD PASSWORD: it is WAY too short" { exit 0 }
+             "BAD PASSWORD: The password is shorter than 8 characters" { exit 0 }
              "BAD PASSWORD: it is too short" { exit 0 }
              "BAD PASSWORD: it does not contain enough DIFFERENT characters" { exit 0 }
-             "BAD PASSWORD: is a palindrome" { exit 0 }
+             "BAD PASSWORD: The password fails the dictionary check - it does not contain enough DIFFERENT characters" { exit 0 }
          }
      }
 }