Fri Sep 23 17:36:45 UTC 2011

Author: nekral-guest
Date: 2011-09-23 17:36:45 +0000 (Fri, 23 Sep 2011)
New Revision: 3495

Added:
   debian/trunk/tests/convtools/20_pwunconv_usage_option/
   debian/trunk/tests/convtools/20_pwunconv_usage_option/config.txt
   debian/trunk/tests/convtools/20_pwunconv_usage_option/config/
   debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/
   debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/group
   debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/gshadow
   debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/passwd
   debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/shadow
   debian/trunk/tests/convtools/20_pwunconv_usage_option/data/
   debian/trunk/tests/convtools/20_pwunconv_usage_option/data/usage.out
   debian/trunk/tests/convtools/20_pwunconv_usage_option/pwunconv.test
   debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/
   debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config.txt
   debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/
   debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/
   debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/group
   debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/gshadow
   debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/passwd
   debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/shadow
   debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/data/
   debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/data/passwd
   debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/pwunconv.test
   debian/trunk/tests/convtools/22_grpunconv_usage_option/
   debian/trunk/tests/convtools/22_grpunconv_usage_option/config.txt
   debian/trunk/tests/convtools/22_grpunconv_usage_option/config/
   debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/
   debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/group
   debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/gshadow
   debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/passwd
   debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/shadow
   debian/trunk/tests/convtools/22_grpunconv_usage_option/data/
   debian/trunk/tests/convtools/22_grpunconv_usage_option/data/usage.out
   debian/trunk/tests/convtools/22_grpunconv_usage_option/grpunconv.test
   debian/trunk/tests/convtools/23_grpunconv_keep_group_password/
   debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config.txt
   debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/
   debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/
   debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/group
   debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/gshadow
   debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/passwd
   debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/shadow
   debian/trunk/tests/convtools/23_grpunconv_keep_group_password/data/
   debian/trunk/tests/convtools/23_grpunconv_keep_group_password/data/group
   debian/trunk/tests/convtools/23_grpunconv_keep_group_password/grpunconv.test
   debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/
   debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config.txt
   debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/
   debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/
   debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/group
   debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/gshadow
   debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/passwd
   debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/shadow
   debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/data/
   debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/data/group
   debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/grpunconv.test
   debian/trunk/tests/convtools/25_pwconv_usage_option/
   debian/trunk/tests/convtools/25_pwconv_usage_option/config.txt
   debian/trunk/tests/convtools/25_pwconv_usage_option/config/
   debian/trunk/tests/convtools/25_pwconv_usage_option/config/etc/
   debian/trunk/tests/convtools/25_pwconv_usage_option/config/etc/group
   debian/trunk/tests/convtools/25_pwconv_usage_option/config/etc/gshadow
   debian/trunk/tests/convtools/25_pwconv_usage_option/config/etc/passwd
   debian/trunk/tests/convtools/25_pwconv_usage_option/config/etc/shadow
   debian/trunk/tests/convtools/25_pwconv_usage_option/data/
   debian/trunk/tests/convtools/25_pwconv_usage_option/data/usage.out
   debian/trunk/tests/convtools/25_pwconv_usage_option/pwconv.test
   debian/trunk/tests/convtools/26_grpconv_usage_option/
   debian/trunk/tests/convtools/26_grpconv_usage_option/config.txt
   debian/trunk/tests/convtools/26_grpconv_usage_option/config/
   debian/trunk/tests/convtools/26_grpconv_usage_option/config/etc/
   debian/trunk/tests/convtools/26_grpconv_usage_option/config/etc/group
   debian/trunk/tests/convtools/26_grpconv_usage_option/config/etc/gshadow
   debian/trunk/tests/convtools/26_grpconv_usage_option/config/etc/passwd
   debian/trunk/tests/convtools/26_grpconv_usage_option/config/etc/shadow
   debian/trunk/tests/convtools/26_grpconv_usage_option/data/
   debian/trunk/tests/convtools/26_grpconv_usage_option/data/usage.out
   debian/trunk/tests/convtools/26_grpconv_usage_option/grpconv.test
Log:
Added tests:
 * pwunconv  (2)
 * grpunconv (3)
 * pwconv    (1)
 * grpconv   (1)


Added: debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/group
===================================================================

--- debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/group	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,41 @@
+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:

Added: debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/gshadow
===================================================================
--- debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/gshadow	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/passwd
===================================================================
--- debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/passwd	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,19 @@
+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

Added: debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/shadow
===================================================================
--- debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/20_pwunconv_usage_option/config/etc/shadow	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,19 @@
+root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999: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:::

Added: debian/trunk/tests/convtools/20_pwunconv_usage_option/config.txt
===================================================================
--- debian/trunk/tests/convtools/20_pwunconv_usage_option/config.txt	                        (rev 0)
+++ debian/trunk/tests/convtools/20_pwunconv_usage_option/config.txt	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,10 @@
+# no testsuite password
+# root password: rootF00barbaz
+# myuser password: myuserF00barbaz
+
+user foo, in group users (only in /etc/group)
+user foo, in group tty (only in /etc/gshadow)
+user foo, in group floppy
+user foo, admin of group disk
+user foo, admin and member of group fax
+user foo, admin and member of group cdrom (only in /etc/gshadow)

Added: debian/trunk/tests/convtools/20_pwunconv_usage_option/data/usage.out
===================================================================
--- debian/trunk/tests/convtools/20_pwunconv_usage_option/data/usage.out	                        (rev 0)
+++ debian/trunk/tests/convtools/20_pwunconv_usage_option/data/usage.out	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1 @@
+Usage: pwunconv

Added: debian/trunk/tests/convtools/20_pwunconv_usage_option/pwunconv.test
===================================================================
--- debian/trunk/tests/convtools/20_pwunconv_usage_option/pwunconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/20_pwunconv_usage_option/pwunconv.test	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "pwunconv displays its usage message in case there isn't the right number of arguments"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Get pwunconv usage (pwunconv -Z)..."
+pwunconv -Z 2>tmp/usage.out && exit 1 || {
+	status=$?
+}
+echo "OK"
+
+echo -n "Check returned status ($status)..."
+test "$status" = "1"
+echo "OK"
+
+echo "pwunconv 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/convtools/20_pwunconv_usage_option/pwunconv.test
___________________________________________________________________
Added: svn:executable
   + *

Added: debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/group
===================================================================
--- debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/group	2011-09-23 17:36:45 UTC (rev 3495)
@@ -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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/gshadow
===================================================================
--- debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/gshadow	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/passwd
===================================================================
--- debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/passwd	2011-09-23 17:36:45 UTC (rev 3495)
@@ -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:foopass:1000:1000:::/bin/false

Added: debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/shadow
===================================================================
--- debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/shadow	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,20 @@
+root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999: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:fooshadowpasswd:12977:0:99999:7:::

Added: debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config.txt
===================================================================
--- debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config.txt	                        (rev 0)
+++ debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/config.txt	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1 @@
+user foo with a password in passwd (and shadow)

Added: debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/data/passwd
===================================================================
--- debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/data/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/data/passwd	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,20 @@
+root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:0:0:root:/root:/bin/bash
+daemon:*:1:1:daemon:/usr/sbin:/bin/sh
+bin:*:2:2:bin:/bin:/bin/sh
+sys:*:3:3:sys:/dev:/bin/sh
+sync:*:4:65534:sync:/bin:/bin/sync
+games:*:5:60:games:/usr/games:/bin/sh
+man:*:6:12:man:/var/cache/man:/bin/sh
+lp:*:7:7:lp:/var/spool/lpd:/bin/sh
+mail:*:8:8:mail:/var/mail:/bin/sh
+news:*:9:9:news:/var/spool/news:/bin/sh
+uucp:*:10:10:uucp:/var/spool/uucp:/bin/sh
+proxy:*:13:13:proxy:/bin:/bin/sh
+www-data:*:33:33:www-data:/var/www:/bin/sh
+backup:*:34:34:backup:/var/backups:/bin/sh
+list:*:38:38:Mailing List Manager:/var/list:/bin/sh
+irc:*:39:39:ircd:/var/run/ircd:/bin/sh
+gnats:*:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
+nobody:*:65534:65534:nobody:/nonexistent:/bin/sh
+Debian-exim:!:102:102::/var/spool/exim4:/bin/false
+foo:foopass:1000:1000:::/bin/false

Added: debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/pwunconv.test
===================================================================
--- debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/pwunconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/21_pwunconv_keep_passwd_password/pwunconv.test	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "pwunconv keeps the password from /etc/passwd (if not 'x'"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Unconvert the shadow file (pwunconv)..."
+pwunconv
+echo "OK"
+
+echo -n "Check the passwd file..."
+../../common/compare_file.pl data/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..."
+test ! -f /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/convtools/21_pwunconv_keep_passwd_password/pwunconv.test
___________________________________________________________________
Added: svn:executable
   + *

Added: debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/group
===================================================================
--- debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/group	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,41 @@
+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:

Added: debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/gshadow
===================================================================
--- debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/gshadow	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,41 @@
+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::

Added: debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/passwd
===================================================================
--- debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/passwd	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,19 @@
+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

Added: debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/shadow
===================================================================
--- debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/22_grpunconv_usage_option/config/etc/shadow	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,19 @@
+root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999: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:::

Added: debian/trunk/tests/convtools/22_grpunconv_usage_option/config.txt
===================================================================
--- debian/trunk/tests/convtools/22_grpunconv_usage_option/config.txt	                        (rev 0)
+++ debian/trunk/tests/convtools/22_grpunconv_usage_option/config.txt	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,10 @@
+# no testsuite password
+# root password: rootF00barbaz
+# myuser password: myuserF00barbaz
+
+user foo, in group users (only in /etc/group)
+user foo, in group tty (only in /etc/gshadow)
+user foo, in group floppy
+user foo, admin of group disk
+user foo, admin and member of group fax
+user foo, admin and member of group cdrom (only in /etc/gshadow)

Added: debian/trunk/tests/convtools/22_grpunconv_usage_option/data/usage.out
===================================================================
--- debian/trunk/tests/convtools/22_grpunconv_usage_option/data/usage.out	                        (rev 0)
+++ debian/trunk/tests/convtools/22_grpunconv_usage_option/data/usage.out	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1 @@
+Usage: grpunconv

Added: debian/trunk/tests/convtools/22_grpunconv_usage_option/grpunconv.test
===================================================================
--- debian/trunk/tests/convtools/22_grpunconv_usage_option/grpunconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/22_grpunconv_usage_option/grpunconv.test	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "grpunconv displays its usage message in case there isn't the right number of arguments"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Get grpunconv usage (grpunconv -Z)..."
+grpunconv -Z 2>tmp/usage.out && exit 1 || {
+	status=$?
+}
+echo "OK"
+
+echo -n "Check returned status ($status)..."
+test "$status" = "1"
+echo "OK"
+
+echo "grpunconv 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/convtools/22_grpunconv_usage_option/grpunconv.test
___________________________________________________________________
Added: svn:executable
   + *

Added: debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/group
===================================================================
--- debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/group	2011-09-23 17:36:45 UTC (rev 3495)
@@ -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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:$1$foogroupPassword:1000:

Added: debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/gshadow
===================================================================
--- debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/gshadow	2011-09-23 17:36:45 UTC (rev 3495)
@@ -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:fooshadowpass::

Added: debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/passwd
===================================================================
--- debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/passwd	2011-09-23 17:36:45 UTC (rev 3495)
@@ -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:foopass:1000:1000:::/bin/false

Added: debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/shadow
===================================================================
--- debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config/etc/shadow	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,20 @@
+root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999: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:fooshadowpasswd:12977:0:99999:7:::

Added: debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config.txt
===================================================================
--- debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config.txt	                        (rev 0)
+++ debian/trunk/tests/convtools/23_grpunconv_keep_group_password/config.txt	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1 @@
+user foo with a password in passwd (and shadow)

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

Added: debian/trunk/tests/convtools/23_grpunconv_keep_group_password/grpunconv.test
===================================================================
--- debian/trunk/tests/convtools/23_grpunconv_keep_group_password/grpunconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/23_grpunconv_keep_group_password/grpunconv.test	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "grpunconv keeps the password from /etc/group (if not 'x'"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Unconvert the shadow file (grpunconv)..."
+grpunconv
+echo "OK"
+
+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 data/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..."
+test ! -f /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/convtools/23_grpunconv_keep_group_password/grpunconv.test
___________________________________________________________________
Added: svn:executable
   + *

Added: debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/group
===================================================================
--- debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/group	                        (rev 0)
+++ debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/group	2011-09-23 17:36:45 UTC (rev 3495)
@@ -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:foo
+nogroup:x:65534:
+crontab:x:101:
+Debian-exim:x:102:
+foo:x:1000:

Added: debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/gshadow
===================================================================
--- debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/gshadow	                        (rev 0)
+++ debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/gshadow	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,41 @@
+root:*::
+daemon:*::
+bin:*::
+sys:*::
+adm:*::
+tty:*::
+disk:*::
+lp:*::
+news:*::
+uucp:*::
+man:*::
+proxy:*::
+kmem:*::
+dialout:*::
+fax:*::
+voice:*::
+cdrom:*::
+floppy:*::
+tape:*::
+sudo:*::
+audio:*::
+dip:*::
+www-data:*::
+backup:*::
+operator:*::
+list:*::
+irc:*::
+src:*::
+gnats:*::
+shadow:*::
+video:*::
+sasl:*::
+plugdev:*::
+staff:*::
+games:*::
+users:*::
+nogroup:*::
+crontab:x::
+Debian-exim:x::
+foo:*::
+bar:*::

Added: debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/passwd
===================================================================
--- debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/passwd	                        (rev 0)
+++ debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/passwd	2011-09-23 17:36:45 UTC (rev 3495)
@@ -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::/home/foo:/bin/false

Added: debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/shadow
===================================================================
--- debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/shadow	                        (rev 0)
+++ debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/shadow	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,20 @@
+root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999: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/convtools/24_grpunconv_no_gshadow_entry/config.txt
===================================================================
--- debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config.txt	                        (rev 0)
+++ debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/config.txt	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1 @@
+user foo, in group users

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

Added: debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/grpunconv.test
===================================================================
--- debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/grpunconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/grpunconv.test	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "grpunconv succeeds even if some entries are no in gshadow"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Convert the group files (grpunconv)..."
+grpunconv
+echo "OK"
+
+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 data/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..."
+test ! -f /etc/gshadow
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+


Property changes on: debian/trunk/tests/convtools/24_grpunconv_no_gshadow_entry/grpunconv.test
___________________________________________________________________
Added: svn:executable
   + *

Added: debian/trunk/tests/convtools/25_pwconv_usage_option/config/etc/group
===================================================================
Added: debian/trunk/tests/convtools/25_pwconv_usage_option/config/etc/gshadow
===================================================================
Added: debian/trunk/tests/convtools/25_pwconv_usage_option/config/etc/passwd
===================================================================
Added: debian/trunk/tests/convtools/25_pwconv_usage_option/config/etc/shadow
===================================================================
Added: debian/trunk/tests/convtools/25_pwconv_usage_option/config.txt
===================================================================
Added: debian/trunk/tests/convtools/25_pwconv_usage_option/data/usage.out
===================================================================
--- debian/trunk/tests/convtools/25_pwconv_usage_option/data/usage.out	                        (rev 0)
+++ debian/trunk/tests/convtools/25_pwconv_usage_option/data/usage.out	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1 @@
+Usage: pwconv

Added: debian/trunk/tests/convtools/25_pwconv_usage_option/pwconv.test
===================================================================
--- debian/trunk/tests/convtools/25_pwconv_usage_option/pwconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/25_pwconv_usage_option/pwconv.test	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "pwconv displays its usage message in case there isn't the right number of arguments"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Get pwconv usage (pwconv -Z)..."
+pwconv -Z 2>tmp/usage.out && exit 1 || {
+	status=$?
+}
+echo "OK"
+
+echo -n "Check returned status ($status)..."
+test "$status" = "2"
+echo "OK"
+
+echo "pwconv 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/convtools/25_pwconv_usage_option/pwconv.test
___________________________________________________________________
Added: svn:executable
   + *

Added: debian/trunk/tests/convtools/26_grpconv_usage_option/config/etc/group
===================================================================
Added: debian/trunk/tests/convtools/26_grpconv_usage_option/config/etc/gshadow
===================================================================
Added: debian/trunk/tests/convtools/26_grpconv_usage_option/config/etc/passwd
===================================================================
Added: debian/trunk/tests/convtools/26_grpconv_usage_option/config/etc/shadow
===================================================================
Added: debian/trunk/tests/convtools/26_grpconv_usage_option/config.txt
===================================================================
Added: debian/trunk/tests/convtools/26_grpconv_usage_option/data/usage.out
===================================================================
Added: debian/trunk/tests/convtools/26_grpconv_usage_option/grpconv.test
===================================================================
--- debian/trunk/tests/convtools/26_grpconv_usage_option/grpconv.test	                        (rev 0)
+++ debian/trunk/tests/convtools/26_grpconv_usage_option/grpconv.test	2011-09-23 17:36:45 UTC (rev 3495)
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "grpconv displays its usage message in case there isn't the right number of arguments"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+change_config
+
+echo -n "Get grpconv usage (grpconv -Z)..."
+grpconv -Z 2>tmp/usage.out && exit 1 || {
+	status=$?
+}
+echo "OK"
+
+echo -n "Check returned status ($status)..."
+test "$status" = "2"
+echo "OK"
+
+echo "grpconv 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/convtools/26_grpconv_usage_option/grpconv.test
___________________________________________________________________
Added: svn:executable
   + *


