Sat May 9 22:27:13 UTC 2009

Author: nekral-guest
Date: 2009-05-09 22:27:13 +0000 (Sat, 09 May 2009)
New Revision: 2888

Added:
   debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/data/
   debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/data/passwd.out
   debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/data/
   debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/data/passwd.out
   debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/data/
   debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/data/passwd.out
   debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/data/
   debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/data/passwd.out
   debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/data/
   debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/data/passwd.out
   debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/data/passwd.out
   debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/data/passwd.out
   debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/data/passwd.out
   debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/data/
   debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/data/passwd.err
   debian/trunk/tests/passwd/10_passwd_-d_root/data/passwd.out
   debian/trunk/tests/passwd/11_passwd_--mindays_root/data/passwd.out
   debian/trunk/tests/passwd/12_passwd_--maxdays_root/data/passwd.out
   debian/trunk/tests/passwd/13_passwd_--warndays_root/data/passwd.out
   debian/trunk/tests/passwd/14_passwd_--inactive_root/data/passwd.out
   debian/trunk/tests/passwd/15_passwd_--expire_root/data/passwd.out
Removed:
   debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/passwd.exp
   debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/passwd.exp
   debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/passwd.exp
   debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/passwd.exp
   debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/passwd.exp
   debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/passwd.exp
   debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/passwd.exp
   debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/passwd.exp
   debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/passwd.exp
   debian/trunk/tests/passwd/10_passwd_-d_root/passwd.exp
   debian/trunk/tests/passwd/11_passwd_--mindays_root/passwd.exp
   debian/trunk/tests/passwd/12_passwd_--maxdays_root/passwd.exp
   debian/trunk/tests/passwd/13_passwd_--warndays_root/passwd.exp
   debian/trunk/tests/passwd/14_passwd_--inactive_root/passwd.exp
   debian/trunk/tests/passwd/15_passwd_--expire_root/passwd.exp
Modified:
   debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/config/etc/group
   debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/passwd.test
   debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/config/etc/group
   debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/passwd.test
   debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/config/etc/group
   debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/passwd.test
   debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/group
   debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/passwd.test
   debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/group
   debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/passwd.test
   debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/config/etc/group
   debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/passwd.test
   debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/group
   debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/passwd.test
   debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/group
   debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/passwd.test
   debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/group
   debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/passwd.test
   debian/trunk/tests/passwd/10_passwd_-d_root/config/etc/group
   debian/trunk/tests/passwd/10_passwd_-d_root/passwd.test
   debian/trunk/tests/passwd/11_passwd_--mindays_root/config/etc/group
   debian/trunk/tests/passwd/11_passwd_--mindays_root/passwd.test
   debian/trunk/tests/passwd/12_passwd_--maxdays_root/config/etc/group
   debian/trunk/tests/passwd/12_passwd_--maxdays_root/passwd.test
   debian/trunk/tests/passwd/13_passwd_--warndays_root/config/etc/group
   debian/trunk/tests/passwd/13_passwd_--warndays_root/passwd.test
   debian/trunk/tests/passwd/14_passwd_--inactive_root/config/etc/group
   debian/trunk/tests/passwd/14_passwd_--inactive_root/passwd.test
   debian/trunk/tests/passwd/15_passwd_--expire_root/config/etc/group
   debian/trunk/tests/passwd/15_passwd_--expire_root/passwd.test
   debian/trunk/tests/passwd/16_passwd_-S-a_root/config/etc/group
   debian/trunk/tests/passwd/16_passwd_-S-a_root/passwd.test
Log:
There is no need to use expect for these tests.
Only check the stdout/stderr output.


Modified: debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/config/etc/group
===================================================================

--- debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+foo L 07/14/2005 0 99999 7 -1

Deleted: debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,14 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd -S foo\r"
-expect "foo L 07/14/2005 0 99999 7 -1"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/passwd.test
===================================================================
--- debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/01_passwd_-S_root_locked_account/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -16,8 +16,19 @@
 
 change_config
 
-./passwd.exp
+echo -n "Request password information for user foo (passwd -S foo)..."
+passwd -S foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+foo P 07/13/2005 0 99999 7 -1

Deleted: debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,14 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd -S foo\r"
-expect "foo P 07/13/2005 0 99999 7 -1"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/passwd.test
===================================================================
--- debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/02_passwd_-S_root_valid_account/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -16,8 +16,19 @@
 
 change_config
 
-./passwd.exp
+echo -n "Request password information for user foo (passwd -S foo)..."
+passwd -S foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+foo NP 07/24/2005 0 99998 8 -1

Deleted: debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,14 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd -S foo\r"
-expect "foo NP 07/24/2005 0 99998 8 -1"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/passwd.test
===================================================================
--- debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/03_passwd_-S_root_empty_password/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -16,8 +16,19 @@
 
 change_config
 
-./passwd.exp
+echo -n "Request password information for user foo (passwd -S foo)..."
+passwd -S foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+foo P

Deleted: debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,14 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd -S foo\r"
-expect "foo P"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/passwd.test
===================================================================
--- debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -20,8 +20,19 @@
 rm -f /etc/shadow
 echo "OK"
 
-./passwd.exp
+echo -n "Request password information for user foo (passwd -S foo)..."
+passwd -S foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+foo L

Deleted: debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,14 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd -S foo\r"
-expect "foo L"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/passwd.test
===================================================================
--- debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -16,8 +16,19 @@
 
 change_config
 
-./passwd.exp
+echo -n "Request password information for user foo (passwd -S foo)..."
+passwd -S foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+passwd: password expiry information changed.
\ No newline at end of file

Deleted: debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,17 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd -l foo\r"
-expect "Password changed."
-expect "# "
-send "echo \$?\r"
-expect "0"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/passwd.test
===================================================================
--- debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/06_passwd_-l_root_lock_account/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -7,7 +7,7 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "passwd can report the status of an account to root"
+log_start "$0" "root can lock a password with passwd -l"
 
 save_config
 
@@ -16,8 +16,19 @@
 
 change_config
 
-./passwd.exp
+echo -n "Lock foo's password (passwd -l foo)..."
+passwd -l foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+passwd: password expiry information changed.
\ No newline at end of file

Deleted: debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,17 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd -l foo\r"
-expect "Password changed."
-expect "# "
-send "echo \$?\r"
-expect "0"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/passwd.test
===================================================================
--- debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -7,7 +7,7 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "passwd can report the status of an account to root"
+log_start "$0" "passwd can lock a password in /etc/passwd"
 
 save_config
 
@@ -16,8 +16,19 @@
 
 change_config
 
-./passwd.exp
+echo -n "Lock foo's password (passwd -l foo)..."
+passwd -l foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl data/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+passwd: password expiry information changed.
\ No newline at end of file

Deleted: debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,17 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd -u foo\r"
-expect "Password changed."
-expect "# "
-send "echo \$?\r"
-expect "0"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/passwd.test
===================================================================
--- debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/08_passwd_-u_root_unlock_account/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -7,7 +7,7 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "passwd can report the status of an account to root"
+log_start "$0" "root can unlock a password with passwd -u"
 
 save_config
 
@@ -16,8 +16,19 @@
 
 change_config
 
-./passwd.exp
+echo -n "unlock foo's password (passwd -u foo)..."
+passwd -u foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/data/passwd.err
===================================================================
--- debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/data/passwd.err	                        (rev 0)
+++ debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/data/passwd.err	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1,2 @@
+passwd: unlocking the password would result in a passwordless account.
+You should set a password with usermod -p to unlock the password of this account.

Deleted: debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,19 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd -u foo\r"
-expect "passwd: unlocking the password would result in a passwordless account."
-expect "You should set a password with usermod -p to unlock the password of this account."
-expect "Password changed."
-expect "# "
-send "echo \$?\r"
-expect "0"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/passwd.test
===================================================================
--- debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/09_passwd_-u_root_unlock_to_empty/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -7,7 +7,7 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "passwd can report the status of an account to root"
+log_start "$0" "passwd -u cannot create a passwordless account"
 
 save_config
 
@@ -16,8 +16,25 @@
 
 change_config
 
-./passwd.exp
+echo -n "Unlock foo's pasword (passwd -u foo)..."
+passwd -u foo 2> tmp/passwd.err && exit 1 || {
+        status=$?
+}
+echo "OK"
 
+echo -n "Check returned status ($status)..."
+test "$status" = "3"
+echo "OK"
+
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.err
+echo "======================================================================="
+echo -n "Check the error message..."
+diff -au data/passwd.err tmp/passwd.err
+echo "error message OK."
+rm -f tmp/passwd.err
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/10_passwd_-d_root/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/10_passwd_-d_root/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/10_passwd_-d_root/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/10_passwd_-d_root/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/10_passwd_-d_root/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/10_passwd_-d_root/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+passwd: password expiry information changed.
\ No newline at end of file

Deleted: debian/trunk/tests/passwd/10_passwd_-d_root/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/10_passwd_-d_root/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/10_passwd_-d_root/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,17 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd -d foo\r"
-expect "Password changed."
-expect "# "
-send "echo \$?\r"
-expect "0"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/10_passwd_-d_root/passwd.test
===================================================================
--- debian/trunk/tests/passwd/10_passwd_-d_root/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/10_passwd_-d_root/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -7,7 +7,7 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "passwd can report the status of an account to root"
+log_start "$0" "root can delete a password with passwd -d"
 
 save_config
 
@@ -16,8 +16,19 @@
 
 change_config
 
-./passwd.exp
+echo -n "Delete foo's password (passwd -d foo)..."
+passwd -d foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/11_passwd_--mindays_root/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/11_passwd_--mindays_root/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/11_passwd_--mindays_root/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/11_passwd_--mindays_root/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/11_passwd_--mindays_root/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/11_passwd_--mindays_root/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+passwd: password expiry information changed.
\ No newline at end of file

Deleted: debian/trunk/tests/passwd/11_passwd_--mindays_root/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/11_passwd_--mindays_root/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/11_passwd_--mindays_root/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,17 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd --mindays 10 foo\r"
-expect "Password changed."
-expect "# "
-send "echo \$?\r"
-expect "0"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/11_passwd_--mindays_root/passwd.test
===================================================================
--- debian/trunk/tests/passwd/11_passwd_--mindays_root/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/11_passwd_--mindays_root/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -7,7 +7,7 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "passwd can report the status of an account to root"
+log_start "$0" "root can use passwd --mindays"
 
 save_config
 
@@ -16,8 +16,19 @@
 
 change_config
 
-./passwd.exp
+echo -n "Change the min number of days for foo's password (passwd --mindays 10 foo)..."
+passwd --mindays 10 foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/12_passwd_--maxdays_root/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/12_passwd_--maxdays_root/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/12_passwd_--maxdays_root/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/12_passwd_--maxdays_root/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/12_passwd_--maxdays_root/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/12_passwd_--maxdays_root/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+passwd: password expiry information changed.
\ No newline at end of file

Deleted: debian/trunk/tests/passwd/12_passwd_--maxdays_root/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/12_passwd_--maxdays_root/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/12_passwd_--maxdays_root/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,17 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd --maxdays 10 foo\r"
-expect "Password changed."
-expect "# "
-send "echo \$?\r"
-expect "0"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/12_passwd_--maxdays_root/passwd.test
===================================================================
--- debian/trunk/tests/passwd/12_passwd_--maxdays_root/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/12_passwd_--maxdays_root/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -7,7 +7,7 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "passwd can report the status of an account to root"
+log_start "$0" "root can use passwd --maxdays"
 
 save_config
 
@@ -16,8 +16,19 @@
 
 change_config
 
-./passwd.exp
+echo -n "Change the max number of days for foo's password (passwd --maxdays 10 foo)..."
+passwd --maxdays 10 foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/13_passwd_--warndays_root/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/13_passwd_--warndays_root/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/13_passwd_--warndays_root/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/13_passwd_--warndays_root/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/13_passwd_--warndays_root/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/13_passwd_--warndays_root/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+passwd: password expiry information changed.
\ No newline at end of file

Deleted: debian/trunk/tests/passwd/13_passwd_--warndays_root/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/13_passwd_--warndays_root/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/13_passwd_--warndays_root/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,17 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd --warndays 10 foo\r"
-expect "Password changed."
-expect "# "
-send "echo \$?\r"
-expect "0"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/13_passwd_--warndays_root/passwd.test
===================================================================
--- debian/trunk/tests/passwd/13_passwd_--warndays_root/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/13_passwd_--warndays_root/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -7,7 +7,7 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "passwd can report the status of an account to root"
+log_start "$0" "root can use passwd --warndays"
 
 save_config
 
@@ -16,8 +16,19 @@
 
 change_config
 
-./passwd.exp
+echo -n "Change the number of warning days for foo's password (passwd --warndays 10 foo)..."
+passwd --warndays 10 foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/14_passwd_--inactive_root/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/14_passwd_--inactive_root/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/14_passwd_--inactive_root/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/14_passwd_--inactive_root/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/14_passwd_--inactive_root/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/14_passwd_--inactive_root/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+passwd: password expiry information changed.
\ No newline at end of file

Deleted: debian/trunk/tests/passwd/14_passwd_--inactive_root/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/14_passwd_--inactive_root/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/14_passwd_--inactive_root/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,17 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd --inactive 10 foo\r"
-expect "Password changed."
-expect "# "
-send "echo \$?\r"
-expect "0"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/14_passwd_--inactive_root/passwd.test
===================================================================
--- debian/trunk/tests/passwd/14_passwd_--inactive_root/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/14_passwd_--inactive_root/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -7,7 +7,7 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "passwd can report the status of an account to root"
+log_start "$0" "root can use passwd --inactive"
 
 save_config
 
@@ -16,8 +16,19 @@
 
 change_config
 
-./passwd.exp
+echo -n "Change the number of inactive days for foo's password (passwd --inactive 10 foo)..."
+passwd --inactive 10 foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/15_passwd_--expire_root/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/15_passwd_--expire_root/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/15_passwd_--expire_root/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Added: debian/trunk/tests/passwd/15_passwd_--expire_root/data/passwd.out
===================================================================
--- debian/trunk/tests/passwd/15_passwd_--expire_root/data/passwd.out	                        (rev 0)
+++ debian/trunk/tests/passwd/15_passwd_--expire_root/data/passwd.out	2009-05-09 22:27:13 UTC (rev 2888)
@@ -0,0 +1 @@
+passwd: password expiry information changed.
\ No newline at end of file

Deleted: debian/trunk/tests/passwd/15_passwd_--expire_root/passwd.exp
===================================================================
--- debian/trunk/tests/passwd/15_passwd_--expire_root/passwd.exp	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/15_passwd_--expire_root/passwd.exp	2009-05-09 22:27:13 UTC (rev 2888)
@@ -1,17 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/sh
-expect "# "
-
-send "passwd --expire foo\r"
-expect "Password set to expire."
-expect "# "
-send "echo \$?\r"
-expect "0"
-expect "# "
-send "exit\r"
-puts "OK\n"
-exit 0

Modified: debian/trunk/tests/passwd/15_passwd_--expire_root/passwd.test
===================================================================
--- debian/trunk/tests/passwd/15_passwd_--expire_root/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/15_passwd_--expire_root/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -7,7 +7,7 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "passwd can report the status of an account to root"
+log_start "$0" "root can use passwd --expire"
 
 save_config
 
@@ -16,8 +16,19 @@
 
 change_config
 
-./passwd.exp
+echo -n "Set foo's password as expired (passwd --expire foo)..."
+passwd --expire foo > tmp/passwd.out
+echo "OK"
 
+echo "passwd reported:"
+echo "======================================================================="
+cat tmp/passwd.out
+echo "======================================================================="
+echo -n "Check the message..."
+diff -au data/passwd.out tmp/passwd.out
+echo "message OK."
+rm -f tmp/passwd.out
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Modified: debian/trunk/tests/passwd/16_passwd_-S-a_root/config/etc/group
===================================================================
--- debian/trunk/tests/passwd/16_passwd_-S-a_root/config/etc/group	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/16_passwd_-S-a_root/config/etc/group	2009-05-09 22:27:13 UTC (rev 2888)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x
+foo:x:1000:

Modified: debian/trunk/tests/passwd/16_passwd_-S-a_root/passwd.test
===================================================================
--- debian/trunk/tests/passwd/16_passwd_-S-a_root/passwd.test	2009-05-09 22:23:32 UTC (rev 2887)
+++ debian/trunk/tests/passwd/16_passwd_-S-a_root/passwd.test	2009-05-09 22:27:13 UTC (rev 2888)
@@ -23,9 +23,9 @@
 echo "======================================================================="
 cat tmp/passwd.out
 echo "======================================================================="
-echo -n "Check that there were a failure message..."
+echo -n "Check the message..."
 diff -au data/passwd.out tmp/passwd.out
-echo "error message OK."
+echo "message OK."
 rm -f tmp/passwd.out
 
 echo -n "Check the passwd file..."


