useradd: fix test `69_useradd_default_GROUPS_name`

Missing files have been added for the test to work: `gshadow`, `passwd`, `shadow`.
Without them, the foo user was created with a different UID and thus the test failed.

And other minor improvements, such as removing extra spaces and adding empty lines.

diff --git a/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/group b/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/group
index 773c93bfdd42c93e45813ff73417cd04285b7e64..101239088bb0c21fc13d6a346fca933bd5f4ebb8 100644 (file)
--- a/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/group
+++ b/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/group
@@ -38,4 +38,4 @@ games:x:60:
 users:x:100:
 nogroup:x:65534:
 crontab:x:101:
-Debian-exim:x:102:
\ No newline at end of file
+Debian-exim:x:102:

diff --git a/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/gshadow b/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/gshadow
new file mode 100644 (file)
index 0000000..ae42486
--- /dev/null
+++ b/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/gshadow
@@ -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::

diff --git a/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/passwd b/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/passwd
new file mode 100644 (file)
index 0000000..43fc135
--- /dev/null
+++ b/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/passwd
@@ -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

diff --git a/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/shadow b/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/shadow
new file mode 100644 (file)
index 0000000..5f50d18
--- /dev/null
+++ b/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/shadow
@@ -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:::

diff --git a/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/group b/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/group
index 02214e633e278865418d3d5080df723dff4a1758..c9c71f8b401a49b819df7ed98bb8d3ff4a702627 100644 (file)
--- a/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/group
+++ b/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/group
@@ -1,4 +1,4 @@
- root:x:0:
+root:x:0:
 daemon:x:1:
 bin:x:2:foo
 sys:x:3:
@@ -39,4 +39,4 @@ users:x:100:
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:1000:
\ No newline at end of file
+foo:x:1000:

diff --git a/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/gshadow b/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/gshadow
new file mode 100644 (file)
index 0000000..ec19c4a
--- /dev/null
+++ b/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/gshadow
@@ -0,0 +1,42 @@
+root:*::
+daemon:*::
+bin:*::foo
+sys:*::
+adm:*::foo
+tty:*::
+disk:*::
+lp:*::
+mail:*::
+news:*::
+uucp:*::
+man:*::foo
+proxy:*::
+kmem:*::
+dialout:*::
+fax:*::
+voice:*::
+cdrom:*::foo
+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:!::

diff --git a/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/passwd b/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/passwd
new file mode 100644 (file)
index 0000000..ed91b35
--- /dev/null
+++ b/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/passwd
@@ -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::/tmp/foo:/bin/foobar

diff --git a/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/shadow b/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/shadow
new file mode 100644 (file)
index 0000000..0aee0c5
--- /dev/null
+++ b/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/shadow
@@ -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:!:@TODAY@:0:99999:7:12:13849:

diff --git a/tests/usertools/useradd/69_useradd_default_GROUPS_name/useradd.test b/tests/usertools/useradd/69_useradd_default_GROUPS_name/useradd.test
index 9446830ffd21c0c554582fad93c7ccb36fa39576..d8747b7deae86966da8ded8f367803fed39085c8 100755 (executable)
--- a/tests/usertools/useradd/69_useradd_default_GROUPS_name/useradd.test
+++ b/tests/usertools/useradd/69_useradd_default_GROUPS_name/useradd.test
@@ -7,7 +7,7 @@ cd "$(dirname $0)"
 . ../../../common/config.sh
 . ../../../common/log.sh
 
-log_start "$0" "useradd adds supplementary groups based on the GROUPS field in /etc/deault/useradd"
+log_start "$0" "useradd adds supplementary groups based on the GROUPS field in /etc/default/useradd"
 
 save_config
 
@@ -20,10 +20,18 @@ printf "Create user foo, with group associations with bin,adm,man,cdrom..."
 useradd foo
 printf "OK\n"
 
+printf "Check the passwd file..."
+../../../common/compare_file.pl data/passwd /etc/passwd
+printf "OK\n"
 printf "Check the group file..."
 ../../../common/compare_file.pl data/group /etc/group
 printf "OK\n"
-
+printf "Check the shadow file..."
+../../../common/compare_file.pl data/shadow /etc/shadow
+printf "OK\n"
+printf "Check the gshadow file..."
+../../../common/compare_file.pl data/gshadow /etc/gshadow
+printf "OK\n"
 
 log_status "$0" "SUCCESS"
 restore_config