[Pkg-shadow-commits] r3608 - in debian/trunk/tests/expiry: . 11_expiry_usage 11_expiry_usage/config 11_expiry_usage/config/etc 11_expiry_usage/data 12_expiry_extra_arg 12_expiry_extra_arg/config 12_expiry_extra_arg/config/etc 12_expiry_extra_arg/data 13_expiry_usage-c-f 13_expiry_usage-c-f/config 13_expiry_usage-c-f/config/etc 13_expiry_usage-c-f/data

Nicolas FRANÇOIS nekral-guest at alioth.debian.org
Mon Nov 14 20:26:12 UTC 2011


Author: nekral-guest
Date: 2011-11-14 20:26:11 +0000 (Mon, 14 Nov 2011)
New Revision: 3608

Added:
   debian/trunk/tests/expiry/11_expiry_usage/
   debian/trunk/tests/expiry/11_expiry_usage/config/
   debian/trunk/tests/expiry/11_expiry_usage/config/etc/
   debian/trunk/tests/expiry/11_expiry_usage/config/etc/group
   debian/trunk/tests/expiry/11_expiry_usage/config/etc/gshadow
   debian/trunk/tests/expiry/11_expiry_usage/config/etc/passwd
   debian/trunk/tests/expiry/11_expiry_usage/config/etc/shadow
   debian/trunk/tests/expiry/11_expiry_usage/data/
   debian/trunk/tests/expiry/11_expiry_usage/data/usage.out
   debian/trunk/tests/expiry/11_expiry_usage/expiry.test
   debian/trunk/tests/expiry/12_expiry_extra_arg/
   debian/trunk/tests/expiry/12_expiry_extra_arg/config/
   debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/
   debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/group
   debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/gshadow
   debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/passwd
   debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/shadow
   debian/trunk/tests/expiry/12_expiry_extra_arg/data/
   debian/trunk/tests/expiry/12_expiry_extra_arg/data/usage.out
   debian/trunk/tests/expiry/12_expiry_extra_arg/expiry.test
   debian/trunk/tests/expiry/13_expiry_usage-c-f/
   debian/trunk/tests/expiry/13_expiry_usage-c-f/config/
   debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/
   debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/group
   debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/gshadow
   debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/passwd
   debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/shadow
   debian/trunk/tests/expiry/13_expiry_usage-c-f/data/
   debian/trunk/tests/expiry/13_expiry_usage-c-f/data/usage.out
   debian/trunk/tests/expiry/13_expiry_usage-c-f/expiry.test
Log:
Add 3 tests for expiry.


Added: debian/trunk/tests/expiry/11_expiry_usage/config/etc/group
===================================================================
--- debian/trunk/tests/expiry/11_expiry_usage/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/expiry/11_expiry_usage/config/etc/group	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,42 @@
+root:x:0:
+daemon:x:1:
+bin:x:2:
+sys:x:3:
+adm:x:4:
+tty:x:5:
+disk:x:6:
+lp:x:7:
+mail:x:8:
+news:x:9:
+uucp:x:10:
+man:x:12:
+proxy:x:13:
+kmem:x:15:
+dialout:x:20:
+fax:x:21:
+voice:x:22:
+cdrom:x:24:
+floppy:x:25:
+tape:x:26:
+sudo:x:27:
+audio:x:29:
+dip:x:30:
+www-data:x:33:
+backup:x:34:
+operator:x:37:
+list:x:38:
+irc:x:39:
+src:x:40:
+gnats:x:41:
+shadow:x:42:
+utmp:x:43:
+video:x:44:
+sasl:x:45:
+plugdev:x:46:
+staff:x:50:
+games:x:60:
+users:x:100:
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:x

Added: debian/trunk/tests/expiry/11_expiry_usage/config/etc/gshadow
===================================================================
--- debian/trunk/tests/expiry/11_expiry_usage/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/expiry/11_expiry_usage/config/etc/gshadow	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,42 @@
+root:*::
+daemon:*::
+bin:*::
+sys:*::
+adm:*::
+tty:*::
+disk:*::
+lp:*::
+mail:*::
+news:*::
+uucp:*::
+man:*::
+proxy:*::
+kmem:*::
+dialout:*::
+fax:*::
+voice:*::
+cdrom:*::
+floppy:*::
+tape:*::
+sudo:*::
+audio:*::
+dip:*::
+www-data:*::
+backup:*::
+operator:*::
+list:*::
+irc:*::
+src:*::
+gnats:*::
+shadow:*::
+utmp:*::
+video:*::
+sasl:*::
+plugdev:*::
+staff:*::
+games:*::
+users:*::
+nogroup:*::
+crontab:x::
+Debian-exim:x::
+foo:*::

Added: debian/trunk/tests/expiry/11_expiry_usage/config/etc/passwd
===================================================================
--- debian/trunk/tests/expiry/11_expiry_usage/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/expiry/11_expiry_usage/config/etc/passwd	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,20 @@
+root:x:0:0:root:/root:/bin/bash
+daemon:x:1:1:daemon:/usr/sbin:/bin/sh
+bin:x:2:2:bin:/bin:/bin/sh
+sys:x:3:3:sys:/dev:/bin/sh
+sync:x:4:65534:sync:/bin:/bin/sync
+games:x:5:60:games:/usr/games:/bin/sh
+man:x:6:12:man:/var/cache/man:/bin/sh
+lp:x:7:7:lp:/var/spool/lpd:/bin/sh
+mail:x:8:8:mail:/var/mail:/bin/sh
+news:x:9:9:news:/var/spool/news:/bin/sh
+uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
+proxy:x:13:13:proxy:/bin:/bin/sh
+www-data:x:33:33:www-data:/var/www:/bin/sh
+backup:x:34:34:backup:/var/backups:/bin/sh
+list:x:38:38:Mailing List Manager:/var/list:/bin/sh
+irc:x:39:39:ircd:/var/run/ircd:/bin/sh
+gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
+nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
+Debian-exim:x:102:102::/var/spool/exim4:/bin/false
+foo:x:1000:1000:::/bin/false

Added: debian/trunk/tests/expiry/11_expiry_usage/config/etc/shadow
===================================================================
--- debian/trunk/tests/expiry/11_expiry_usage/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/expiry/11_expiry_usage/config/etc/shadow	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,20 @@
+root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:1:7:::
+daemon:*:12977:0:99999:7:::
+bin:*:12977:0:99999:7:::
+sys:*:12977:0:99999:7:::
+sync:*:12977:0:99999:7:::
+games:*:12977:0:99999:7:::
+man:*:12977:0:99999:7:::
+lp:*:12977:0:99999:7:::
+mail:*:12977:0:99999:7:::
+news:*:12977:0:99999:7:::
+uucp:*:12977:0:99999:7:::
+proxy:*:12977:0:99999:7:::
+www-data:*:12977:0:99999:7:::
+backup:*:12977:0:99999:7:::
+list:*:12977:0:99999:7:::
+irc:*:12977:0:99999:7:::
+gnats:*:12977:0:99999:7:::
+nobody:*:12977:0:99999:7:::
+Debian-exim:!:12977:0:99999:7:::
+foo:!:12977:0:99999:7:::

Added: debian/trunk/tests/expiry/11_expiry_usage/data/usage.out
===================================================================
--- debian/trunk/tests/expiry/11_expiry_usage/data/usage.out	                        (rev 0)
+++ debian/trunk/tests/expiry/11_expiry_usage/data/usage.out	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,8 @@
+Usage: expiry [options]
+
+Options:
+  -c, --check                   check the user's password expiration
+  -f, --force                   force password change if the user's password
+                                is expired
+  -h, --help                    display this help message and exit
+

Added: debian/trunk/tests/expiry/11_expiry_usage/expiry.test
===================================================================
--- debian/trunk/tests/expiry/11_expiry_usage/expiry.test	                        (rev 0)
+++ debian/trunk/tests/expiry/11_expiry_usage/expiry.test	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+log_start "$0" "expiry can displayits usage message"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Get expiry usage message (expiry --help)..."
+expiry --help >tmp/usage.out
+echo "OK"
+
+echo "expiry reported:"
+echo "======================================================================="
+cat tmp/usage.out
+echo "======================================================================="
+echo -n "Check the usage message..."
+diff -au data/usage.out tmp/usage.out
+echo "usage message OK."
+rm -f tmp/usage.out
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl config/etc/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl config/etc/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl config/etc/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/expiry/11_expiry_usage/expiry.test
___________________________________________________________________
Added: svn:executable
   + *

Added: debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/group
===================================================================
--- debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/group	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,42 @@
+root:x:0:
+daemon:x:1:
+bin:x:2:
+sys:x:3:
+adm:x:4:
+tty:x:5:
+disk:x:6:
+lp:x:7:
+mail:x:8:
+news:x:9:
+uucp:x:10:
+man:x:12:
+proxy:x:13:
+kmem:x:15:
+dialout:x:20:
+fax:x:21:
+voice:x:22:
+cdrom:x:24:
+floppy:x:25:
+tape:x:26:
+sudo:x:27:
+audio:x:29:
+dip:x:30:
+www-data:x:33:
+backup:x:34:
+operator:x:37:
+list:x:38:
+irc:x:39:
+src:x:40:
+gnats:x:41:
+shadow:x:42:
+utmp:x:43:
+video:x:44:
+sasl:x:45:
+plugdev:x:46:
+staff:x:50:
+games:x:60:
+users:x:100:
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:x

Added: debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/gshadow
===================================================================
--- debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/gshadow	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,42 @@
+root:*::
+daemon:*::
+bin:*::
+sys:*::
+adm:*::
+tty:*::
+disk:*::
+lp:*::
+mail:*::
+news:*::
+uucp:*::
+man:*::
+proxy:*::
+kmem:*::
+dialout:*::
+fax:*::
+voice:*::
+cdrom:*::
+floppy:*::
+tape:*::
+sudo:*::
+audio:*::
+dip:*::
+www-data:*::
+backup:*::
+operator:*::
+list:*::
+irc:*::
+src:*::
+gnats:*::
+shadow:*::
+utmp:*::
+video:*::
+sasl:*::
+plugdev:*::
+staff:*::
+games:*::
+users:*::
+nogroup:*::
+crontab:x::
+Debian-exim:x::
+foo:*::

Added: debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/passwd
===================================================================
--- debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/passwd	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,20 @@
+root:x:0:0:root:/root:/bin/bash
+daemon:x:1:1:daemon:/usr/sbin:/bin/sh
+bin:x:2:2:bin:/bin:/bin/sh
+sys:x:3:3:sys:/dev:/bin/sh
+sync:x:4:65534:sync:/bin:/bin/sync
+games:x:5:60:games:/usr/games:/bin/sh
+man:x:6:12:man:/var/cache/man:/bin/sh
+lp:x:7:7:lp:/var/spool/lpd:/bin/sh
+mail:x:8:8:mail:/var/mail:/bin/sh
+news:x:9:9:news:/var/spool/news:/bin/sh
+uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
+proxy:x:13:13:proxy:/bin:/bin/sh
+www-data:x:33:33:www-data:/var/www:/bin/sh
+backup:x:34:34:backup:/var/backups:/bin/sh
+list:x:38:38:Mailing List Manager:/var/list:/bin/sh
+irc:x:39:39:ircd:/var/run/ircd:/bin/sh
+gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
+nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
+Debian-exim:x:102:102::/var/spool/exim4:/bin/false
+foo:x:1000:1000:::/bin/false

Added: debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/shadow
===================================================================
--- debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/expiry/12_expiry_extra_arg/config/etc/shadow	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,20 @@
+root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:1:7:::
+daemon:*:12977:0:99999:7:::
+bin:*:12977:0:99999:7:::
+sys:*:12977:0:99999:7:::
+sync:*:12977:0:99999:7:::
+games:*:12977:0:99999:7:::
+man:*:12977:0:99999:7:::
+lp:*:12977:0:99999:7:::
+mail:*:12977:0:99999:7:::
+news:*:12977:0:99999:7:::
+uucp:*:12977:0:99999:7:::
+proxy:*:12977:0:99999:7:::
+www-data:*:12977:0:99999:7:::
+backup:*:12977:0:99999:7:::
+list:*:12977:0:99999:7:::
+irc:*:12977:0:99999:7:::
+gnats:*:12977:0:99999:7:::
+nobody:*:12977:0:99999:7:::
+Debian-exim:!:12977:0:99999:7:::
+foo:!:12977:0:99999:7:::

Added: debian/trunk/tests/expiry/12_expiry_extra_arg/data/usage.out
===================================================================
--- debian/trunk/tests/expiry/12_expiry_extra_arg/data/usage.out	                        (rev 0)
+++ debian/trunk/tests/expiry/12_expiry_extra_arg/data/usage.out	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,9 @@
+expiry: unexpected argument: foo
+Usage: expiry [options]
+
+Options:
+  -c, --check                   check the user's password expiration
+  -f, --force                   force password change if the user's password
+                                is expired
+  -h, --help                    display this help message and exit
+

Added: debian/trunk/tests/expiry/12_expiry_extra_arg/expiry.test
===================================================================
--- debian/trunk/tests/expiry/12_expiry_extra_arg/expiry.test	                        (rev 0)
+++ debian/trunk/tests/expiry/12_expiry_extra_arg/expiry.test	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+log_start "$0" "expiry check that no argument remain onthecommand line"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Call expiry with an extra argument (expiry -f foo)..."
+expiry -f foo 2>tmp/usage.out && exit 1 || {
+	status=$?
+}
+echo "OK"
+
+echo -n "Check returned status ($status)..."
+test "$status" = "2"
+echo "OK"
+
+echo "expiry reported:"
+echo "======================================================================="
+cat tmp/usage.out
+echo "======================================================================="
+echo -n "Check the usage message..."
+diff -au data/usage.out tmp/usage.out
+echo "usage message OK."
+rm -f tmp/usage.out
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl config/etc/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl config/etc/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl config/etc/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/expiry/12_expiry_extra_arg/expiry.test
___________________________________________________________________
Added: svn:executable
   + *

Added: debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/group
===================================================================
--- debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/group	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,42 @@
+root:x:0:
+daemon:x:1:
+bin:x:2:
+sys:x:3:
+adm:x:4:
+tty:x:5:
+disk:x:6:
+lp:x:7:
+mail:x:8:
+news:x:9:
+uucp:x:10:
+man:x:12:
+proxy:x:13:
+kmem:x:15:
+dialout:x:20:
+fax:x:21:
+voice:x:22:
+cdrom:x:24:
+floppy:x:25:
+tape:x:26:
+sudo:x:27:
+audio:x:29:
+dip:x:30:
+www-data:x:33:
+backup:x:34:
+operator:x:37:
+list:x:38:
+irc:x:39:
+src:x:40:
+gnats:x:41:
+shadow:x:42:
+utmp:x:43:
+video:x:44:
+sasl:x:45:
+plugdev:x:46:
+staff:x:50:
+games:x:60:
+users:x:100:
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:x

Added: debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/gshadow
===================================================================
--- debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/gshadow	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,42 @@
+root:*::
+daemon:*::
+bin:*::
+sys:*::
+adm:*::
+tty:*::
+disk:*::
+lp:*::
+mail:*::
+news:*::
+uucp:*::
+man:*::
+proxy:*::
+kmem:*::
+dialout:*::
+fax:*::
+voice:*::
+cdrom:*::
+floppy:*::
+tape:*::
+sudo:*::
+audio:*::
+dip:*::
+www-data:*::
+backup:*::
+operator:*::
+list:*::
+irc:*::
+src:*::
+gnats:*::
+shadow:*::
+utmp:*::
+video:*::
+sasl:*::
+plugdev:*::
+staff:*::
+games:*::
+users:*::
+nogroup:*::
+crontab:x::
+Debian-exim:x::
+foo:*::

Added: debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/passwd
===================================================================
--- debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/passwd	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,20 @@
+root:x:0:0:root:/root:/bin/bash
+daemon:x:1:1:daemon:/usr/sbin:/bin/sh
+bin:x:2:2:bin:/bin:/bin/sh
+sys:x:3:3:sys:/dev:/bin/sh
+sync:x:4:65534:sync:/bin:/bin/sync
+games:x:5:60:games:/usr/games:/bin/sh
+man:x:6:12:man:/var/cache/man:/bin/sh
+lp:x:7:7:lp:/var/spool/lpd:/bin/sh
+mail:x:8:8:mail:/var/mail:/bin/sh
+news:x:9:9:news:/var/spool/news:/bin/sh
+uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
+proxy:x:13:13:proxy:/bin:/bin/sh
+www-data:x:33:33:www-data:/var/www:/bin/sh
+backup:x:34:34:backup:/var/backups:/bin/sh
+list:x:38:38:Mailing List Manager:/var/list:/bin/sh
+irc:x:39:39:ircd:/var/run/ircd:/bin/sh
+gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
+nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
+Debian-exim:x:102:102::/var/spool/exim4:/bin/false
+foo:x:1000:1000:::/bin/false

Added: debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/shadow
===================================================================
--- debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/expiry/13_expiry_usage-c-f/config/etc/shadow	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,20 @@
+root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:1:7:::
+daemon:*:12977:0:99999:7:::
+bin:*:12977:0:99999:7:::
+sys:*:12977:0:99999:7:::
+sync:*:12977:0:99999:7:::
+games:*:12977:0:99999:7:::
+man:*:12977:0:99999:7:::
+lp:*:12977:0:99999:7:::
+mail:*:12977:0:99999:7:::
+news:*:12977:0:99999:7:::
+uucp:*:12977:0:99999:7:::
+proxy:*:12977:0:99999:7:::
+www-data:*:12977:0:99999:7:::
+backup:*:12977:0:99999:7:::
+list:*:12977:0:99999:7:::
+irc:*:12977:0:99999:7:::
+gnats:*:12977:0:99999:7:::
+nobody:*:12977:0:99999:7:::
+Debian-exim:!:12977:0:99999:7:::
+foo:!:12977:0:99999:7:::

Added: debian/trunk/tests/expiry/13_expiry_usage-c-f/data/usage.out
===================================================================
--- debian/trunk/tests/expiry/13_expiry_usage-c-f/data/usage.out	                        (rev 0)
+++ debian/trunk/tests/expiry/13_expiry_usage-c-f/data/usage.out	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,9 @@
+expiry: options -c and -f conflict
+Usage: expiry [options]
+
+Options:
+  -c, --check                   check the user's password expiration
+  -f, --force                   force password change if the user's password
+                                is expired
+  -h, --help                    display this help message and exit
+

Added: debian/trunk/tests/expiry/13_expiry_usage-c-f/expiry.test
===================================================================
--- debian/trunk/tests/expiry/13_expiry_usage-c-f/expiry.test	                        (rev 0)
+++ debian/trunk/tests/expiry/13_expiry_usage-c-f/expiry.test	2011-11-14 20:26:11 UTC (rev 3608)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+log_start "$0" "expiry check that the -c and -f flags are not used at the same time"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Call expiry with the -c and -f flags (expiry -f -c)..."
+expiry -f -c 2>tmp/usage.out && exit 1 || {
+	status=$?
+}
+echo "OK"
+
+echo -n "Check returned status ($status)..."
+test "$status" = "2"
+echo "OK"
+
+echo "expiry reported:"
+echo "======================================================================="
+cat tmp/usage.out
+echo "======================================================================="
+echo -n "Check the usage message..."
+diff -au data/usage.out tmp/usage.out
+echo "usage message OK."
+rm -f tmp/usage.out
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl config/etc/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl config/etc/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../common/compare_file.pl config/etc/shadow /etc/shadow
+echo "OK"
+echo -n "Check the gshadow file..."
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/expiry/13_expiry_usage-c-f/expiry.test
___________________________________________________________________
Added: svn:executable
   + *




More information about the Pkg-shadow-commits mailing list