From: Iker Pedrosa <ipedrosa@redhat.com>
Date: Tue, 14 Jul 2026 13:29:12 +0000 (+0200)
Subject: tests/: remove `test_62_usermod_remove_supplementary_groups`
X-Git-Tag: 4.20.0-rc3~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f1dd599630904aed3b7699e28b605cdc29f6f378;p=thirdparty%2Fshadow.git

tests/: remove `test_62_usermod_remove_supplementary_groups`

Remove the original shell based test
`tests/usertools/62_usermod_remove_supplementary_groups/` and its
references from test runner scripts. The test was failing intermittently
and has been successfully transformed to Python framework with improved
reliability.

Signed-off-by: Iker Pedrosa <ipedrosa@redhat.com>
---

diff --git a/tests/run_all b/tests/run_all
index 5b931229e..41f470a63 100755
--- a/tests/run_all
+++ b/tests/run_all
@@ -588,7 +588,6 @@ run_test ./usertools/58_userdel_locked_shadow/userdel.test
 run_test ./usertools/59_userdel_locked_gshadow/userdel.test
 run_test ./usertools/60_userdel_invalid_user/userdel.test
 run_test ./usertools/61_userdel_del_homedir_with_symlinks/userdel.test
-run_test ./usertools/62_usermod_remove_supplementary_groups/usermod.test
 if [ "$USE_PAM" = "yes" ]; then
 	run_test ./usertools/chpasswd-PAM/01_chpasswd_invalid_user/chpasswd.test
 	run_test ./usertools/chpasswd-PAM/02_chpasswd_multiple_users/chpasswd.test
diff --git a/tests/run_all.coverage b/tests/run_all.coverage
index 64969da96..e6944d05f 100755
--- a/tests/run_all.coverage
+++ b/tests/run_all.coverage
@@ -604,7 +604,6 @@ run_test ./usertools/58_userdel_locked_shadow/userdel.test
 run_test ./usertools/59_userdel_locked_gshadow/userdel.test
 run_test ./usertools/60_userdel_invalid_user/userdel.test
 run_test ./usertools/61_userdel_del_homedir_with_symlinks/userdel.test
-run_test ./usertools/62_usermod_remove_supplementary_groups/usermod.test
 if [ "$USE_PAM" = "yes" ]; then
 	run_test ./usertools/chpasswd-PAM/01_chpasswd_invalid_user/chpasswd.test
 	run_test ./usertools/chpasswd-PAM/02_chpasswd_multiple_users/chpasswd.test
diff --git a/tests/run_some b/tests/run_some
index c58f59b0a..213cfc088 100755
--- a/tests/run_some
+++ b/tests/run_some
@@ -155,7 +155,6 @@ run_test ./newuidmap/02_newuidmap_relaxed_gid_check/newuidmap.test
 run_test ./newgidmap/01_newgidmap/newgidmap.test
 run_test ./newgidmap/02_newgidmap_relaxed_gid_check/newgidmap.test
 run_test ./libsubid/04_nss/subidnss.test
-run_test ./usertools/62_usermod_remove_supplementary_groups/usermod.test
 
 echo
 echo "$succeeded test(s) passed"
diff --git a/tests/usertools/62_usermod_remove_supplementary_groups/config.txt b/tests/usertools/62_usermod_remove_supplementary_groups/config.txt
deleted file mode 100644
index 15b78c60a..000000000
--- a/tests/usertools/62_usermod_remove_supplementary_groups/config.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-user foo, in group users (only in /etc/group)
-user bar, in group users (only in /etc/group)
-user foo, in group floppy
-user bar, in group fax
diff --git a/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/default/useradd b/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/default/useradd
deleted file mode 100644
index 31c44abec..000000000
--- a/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/default/useradd
+++ /dev/null
@@ -1,36 +0,0 @@
-# Default values for useradd(8)
-#
-# The SHELL variable specifies the default login shell on your
-# system.
-# Similar to DHSELL in adduser. However, we use "sh" here because
-# useradd is a low level utility and should be as general
-# as possible
-SHELL=/bin/foobar
-#
-# The default group for users
-# 100=users on Debian systems
-# Same as USERS_GID in adduser
-# This argument is used when the -n flag is specified.
-# The default behavior (when -n and -g are not specified) is to create a
-# primary user group with the same name as the user being added to the
-# system.
-GROUP=10
-#
-# The default home directory. Same as DHOME for adduser
-HOME=/tmp
-#
-# The number of days after a password expires until the account 
-# is permanently disabled
-INACTIVE=12
-#
-# The default expire date
-EXPIRE=2007-12-02
-#
-# The SKEL variable specifies the directory containing "skeletal" user
-# files; in other words, files such as a sample .profile that will be
-# copied to the new user's home directory when it is created.
-# SKEL=/etc/skel
-#
-# Defines whether the mail spool should be created while
-# creating the account
-# CREATE_MAIL_SPOOL=yes
diff --git a/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/group b/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/group
deleted file mode 100644
index 3115181c2..000000000
--- a/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/group
+++ /dev/null
@@ -1,43 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root
-tty:x:5:
-disk:x:6:
-lp:x:7:root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:bar
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-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,bar
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
-bar:x:1001:
diff --git a/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/gshadow b/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/gshadow
deleted file mode 100644
index c391b845f..000000000
--- a/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root
-tty:*::
-disk:*::
-lp:*::root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::bar
-voice:*::
-cdrom:*::
-floppy:*::foo
-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/62_usermod_remove_supplementary_groups/config/etc/passwd b/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/passwd
deleted file mode 100644
index d82d5345c..000000000
--- a/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/passwd
+++ /dev/null
@@ -1,21 +0,0 @@
-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
-bar:x:1001:1001::/home/foo:/bin/false
diff --git a/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/shadow b/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/shadow
deleted file mode 100644
index 5f73f335e..000000000
--- a/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/shadow
+++ /dev/null
@@ -1,21 +0,0 @@
-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:::
-bar:!:12977:0:99999:7:::
diff --git a/tests/usertools/62_usermod_remove_supplementary_groups/data/group b/tests/usertools/62_usermod_remove_supplementary_groups/data/group
deleted file mode 100644
index 4a52a21c7..000000000
--- a/tests/usertools/62_usermod_remove_supplementary_groups/data/group
+++ /dev/null
@@ -1,43 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root
-tty:x:5:
-disk:x:6:
-lp:x:7:root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:bar
-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,bar
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
-bar:x:1001:
diff --git a/tests/usertools/62_usermod_remove_supplementary_groups/data/gshadow b/tests/usertools/62_usermod_remove_supplementary_groups/data/gshadow
deleted file mode 100644
index 57cdf9457..000000000
--- a/tests/usertools/62_usermod_remove_supplementary_groups/data/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root
-tty:*::
-disk:*::
-lp:*::root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::bar
-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:*::
diff --git a/tests/usertools/62_usermod_remove_supplementary_groups/usermod.test b/tests/usertools/62_usermod_remove_supplementary_groups/usermod.test
deleted file mode 100755
index bfd70ad81..000000000
--- a/tests/usertools/62_usermod_remove_supplementary_groups/usermod.test
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "usermod can remove users from supplementary groups"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Remove user foo from the 'floppy' group (usermod -rG \"floppy\" foo)..."
-usermod -rG "floppy" foo
-echo "OK"
-
-echo -n "Remove user foo from the 'fax' group (usermod -rG \"fax\" foo)..."
-usermod -rG "fax" foo
-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..."
-../../common/compare_file.pl data/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-