[Audit-test-developer] [PATCH 07/11] Fix augrok msg to work with RHEL6.3

[<mva...@re...>]

From: Miroslav Vadkerti <mva...@re...>

Also include performance enhancements to expect
script. This causes the expect script not wait
for timeout and saves around 20s of time while
running the test.

Signed-off-by: Miroslav Vadkerti <mva...@re...>
---
 audit/libpam/tests/test_pamfaillock_unlock.bash |   34 ++++++++++++++---------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/audit/libpam/tests/test_pamfaillock_unlock.bash b/audit/libpam/tests/test_pamfaillock_unlock.bash
index 58da99b..2ee1750 100755
--- a/audit/libpam/tests/test_pamfaillock_unlock.bash
+++ b/audit/libpam/tests/test_pamfaillock_unlock.bash
@@ -33,29 +33,37 @@ disable_ssh_strong_rng
 
 expect -c '
     spawn ssh $env(TEST_USER)@localhost
-    expect -nocase {Are you sure you want to continue} {send "yes\r"}
-    expect -nocase {password: $} {send "badpassword\r"}
-    expect -nocase {permission denied}
-    expect -nocase {password: $} {send "badpassword\r"}
-    expect -nocase {permission denied}
-    expect -nocase {password: $} {send "badpassword\r"}
-    expect -nocase {permission denied} {close; wait}'
+    expect {
+        {continue} { send "yes\r"; exp_continue }
+	{assword} { send "badpassword\r" }
+    }
+    expect {
+        {denied} { exp_continue }
+        {assword} { send "badpassword\r" }
+    }
+    expect {
+        {denied} { exp_continue }
+        {assword} { send "badpassword\r" }
+    }
+    expect -nocase {denied} { close; wait }'
 
 # test
 /sbin/faillock --user $TEST_USER --reset > /dev/null || exit_error
 
-msg_1="faillock reset uid=$tuid: exe=./sbin/faillock.*res=success.*"
+msg_1="faillock reset uid=$tuid.*exe=./sbin/faillock.*res=success.*"
 augrok -q type=USER_ACCT msg_1=~"$msg_1" || exit_fail
 
 # verify the account is unlocked
 expect -c '
     spawn ssh $env(TEST_USER)@localhost
-    expect -nocase {Are you sure you want to continue} {send "yes\r"}
-    expect -nocase {password: $} {
-        send "$env(TEST_USER_PASSWD)\r"
-        send "PS1=:\\::\r"
+    expect {
+        {continue} { send "yes\r"; exp_continue }
+        {assword} {
+            send "$env(TEST_USER_PASSWD)\r"
+            send "PS1=:\\::\r"
+        }
     }
-    expect {:::$} {close; wait}'
+    expect {:::$} { close; wait }'
 
 msg_2="acct=\"$TEST_USER\" exe=./usr/sbin/sshd.*terminal=ssh res=success.*"
 augrok -q type=CRED_ACQ msg_1=~"PAM:setcred $msg_2" || exit_fail
-- 
1.7.6.5