[Pkg-shadow-devel] [Git][debian/adduser][master] 8 commits: streamline tests
Marc Haber (@zugschlus)
gitlab at salsa.debian.org
Sat Mar 8 16:14:46 GMT 2025
Marc Haber pushed to branch master at Debian / adduser
Commits:
a4b36445 by Marc Haber at 2025-03-08T17:13:17+01:00
streamline tests
Git-Dch: ignore
- - - - -
1baf1fb6 by Marc Haber at 2025-03-08T17:13:32+01:00
streamline tests↲
↲
Git-Dch: ignore↲
- - - - -
98024c15 by Marc Haber at 2025-03-08T17:13:39+01:00
streamline tests↲
↲
Git-Dch: ignore↲
- - - - -
4f40578c by Marc Haber at 2025-03-08T17:13:42+01:00
streamline tests↲
↲
Git-Dch: ignore↲
- - - - -
e8169967 by Marc Haber at 2025-03-08T17:13:46+01:00
streamline tests↲
↲
Git-Dch: ignore↲
- - - - -
d82cdbbc by Marc Haber at 2025-03-08T17:13:51+01:00
streamline tests↲
↲
Git-Dch: ignore↲
- - - - -
1a209aa3 by Marc Haber at 2025-03-08T17:13:56+01:00
streamline tests↲
↲
Git-Dch: ignore↲
- - - - -
1e62d96b by Marc Haber at 2025-03-08T17:14:20+01:00
prepare release
Git-Dch: ignore
- - - - -
8 changed files:
- debian/changelog
- debian/tests/f/backups.t
- debian/tests/f/clones.t
- debian/tests/f/cron_jobs.t
- debian/tests/f/deluser_quiet.t
- debian/tests/f/disabled-login-password.t
- debian/tests/f/locks.t
- debian/tests/f/quiet.t
Changes:
=====================================
debian/changelog
=====================================
@@ -1,8 +1,28 @@
-adduser (3.145~) UNRELEASED; urgency=medium
+adduser (3.145) unstable; urgency=medium
- * NOT YET RELEASED
-
- -- Marc Haber <mh+debian-packages at zugschlus.de> Tue, 04 Mar 2025 22:35:13 +0100
+ [ Marc Haber ]
+ * reduce perl requirements to 5.36 (bookworm) for upgrades
+ * fix a mismatch check in existing_user_status [Matt Barry]
+ * re-work explicit --uid tests (Closes: #1099647)
+ * fix misdetection of non-system accounts as system accounts
+ * add lots of more test cases (Closes: #1099570)
+ * get rid of "foo" user name in some of the tests, streamline tests
+ * Update German program translation.
+ Thanks to Helge Kreutzmann (Closes: #1099678)
+ * Update Polish program translation.
+ Thanks to Grzegorz Kuczyński
+ * Update Japanese program translation.
+ Thanks to Sadaharu Wakisaka
+ * Update German program translation.
+ Thanks to Helge Kreutzmann (Closes: #1099678)
+ * Update Portuguese program translation.
+ Thanks to Américo Monteiro (Closes: #1099771)
+
+ [ Tianyu Chen ]
+ * Update Simplified Chinese program translation.
+ Thanks to Tianyu Chen
+
+ -- Marc Haber <mh+debian-packages at zugschlus.de> Sat, 08 Mar 2025 15:28:02 +0100
adduser (3.144) unstable; urgency=medium
=====================================
debian/tests/f/backups.t
=====================================
@@ -7,8 +7,10 @@ use warnings;
use AdduserTestsCommon;
+my $name="ausbackup";
+
END {
- remove_tree('/var/mail/foo');
+ remove_tree("/var/mail/$name");
}
test_suffix('gz', 'gzip');
@@ -21,34 +23,38 @@ sub test_suffix {
my ($suffix, $program) = @_;
my ($archive, $file_list);
- assert_user_does_not_exist('foo');
- assert_command_success('/usr/sbin/adduser',
+ assert_user_does_not_exist($name);
+ assert_command_success(
+ '/usr/sbin/adduser',
'--stdoutmsglevel=error', '--stderrmsglevel=error',
'--system',
- '--home', '/home/foo',
- 'foo');
- assert_user_exists('foo');
+ '--home', "/home/$name",
+ $name
+ );
+ assert_user_exists($name);
- open (FH, '>', '/home/foo/test.txt');
+ open (FH, '>', "/home/$name/test.txt");
print FH 'created by adduser/backups.t';
close (FH);
- assert_command_success_silent('/usr/sbin/deluser',
+ assert_command_success_silent(
+ '/usr/sbin/deluser',
'--stdoutmsglevel=error', '--stderrmsglevel=error',
'--remove-home',
'--backup-to', '/tmp',
'--backup-suffix', $suffix,
- 'foo');
- assert_user_does_not_exist('foo');
+ $name
+ );
+ assert_user_does_not_exist($name);
- $archive = '/tmp/foo.tar.'.((&which($program, 1)) ? $suffix : 'gz');
+ $archive = "/tmp/$name.tar.".((&which($program, 1)) ? $suffix : 'gz');
assert_path_exists($archive);
assert_path_has_ownership($archive, 'root:root');
assert_path_has_mode($archive, "0600");
$file_list = `tar tf $archive 2>/dev/null`;
ok($? == 0, "archive $archive ($suffix) listing successful");
- ok($file_list =~ qr{home/foo/test.txt}, 'archive contents are correct');
+ ok($file_list =~ qr{home/$name/test.txt}, 'archive contents are correct');
unlink($archive);
}
=====================================
debian/tests/f/clones.t
=====================================
@@ -7,38 +7,41 @@ use diagnostics;
use strict;
use warnings;
+my $name1='ausclone1';
+my $name2='ausclone2';
+
use AdduserTestsCommon;
END {
- remove_tree('/home/foo1');
- remove_tree('/var/mail/foo1');
- remove_tree('/home/foo2');
- remove_tree('/var/mail/foo2');
+ remove_tree("/home/$name1");
+ remove_tree("/var/mail/$name1");
+ remove_tree("/home/$name2");
+ remove_tree("/var/mail/$name2");
}
-assert_user_does_not_exist('foo1');
+assert_user_does_not_exist($name1);
assert_command_success('/usr/sbin/adduser',
'--stdoutmsglevel=error', '--stderrmsglevel=error',
'--system',
- 'foo1');
+ $name1);
-assert_user_does_not_exist('foo2');
+assert_user_does_not_exist($name2);
assert_command_success('/usr/sbin/useradd', '-r',
'-g', scalar getgrnam('nogroup'),
- '-o', '-u', scalar getpwnam('foo1'), '-s', '/usr/sbin/nologin', 'foo2');
+ '-o', '-u', scalar getpwnam($name1), '-s', '/usr/sbin/nologin', $name2);
assert_command_success('/usr/sbin/adduser',
'--stdoutmsglevel=error', '--stderrmsglevel=error',
- 'foo1', 'adm');
-assert_command_success('/usr/sbin/adduser', '-q', 'foo2', 'adm');
+ $name1, 'adm');
+assert_command_success('/usr/sbin/adduser', '-q', $name2, 'adm');
-assert_group_membership_exists('foo1', 'adm');
-assert_group_membership_exists('foo2', 'adm');
+assert_group_membership_exists($name1, 'adm');
+assert_group_membership_exists($name2, 'adm');
-assert_command_success('/usr/sbin/deluser', '-q', 'foo2', 'adm');
+assert_command_success('/usr/sbin/deluser', '-q', $name2, 'adm');
-assert_group_membership_exists('foo1', 'adm');
-assert_group_membership_does_not_exist('foo2', 'adm');
+assert_group_membership_exists($name1, 'adm');
+assert_group_membership_does_not_exist($name2, 'adm');
# vim: tabstop=4 shiftwidth=4 expandtab
=====================================
debian/tests/f/cron_jobs.t
=====================================
@@ -7,40 +7,46 @@ use diagnostics;
use strict;
use warnings;
+my $name='auscron';
+
use AdduserTestsCommon;
END {
- remove_tree('/var/spool/cron/crontabs/foo');
+ remove_tree("/var/spool/cron/crontabs/$name");
}
-assert_user_does_not_exist('foo');
-assert_command_success('/usr/sbin/adduser',
+assert_user_does_not_exist($name);
+assert_command_success(
+ '/usr/sbin/adduser',
'--stdoutmsglevel=error', '--stderrmsglevel=error',
'--system', '--no-create-home',
- 'foo');
-assert_user_exists('foo');
+ $name
+);
+assert_user_exists($name);
my $command;
-assert_path_does_not_exist('/var/spool/cron/crontabs/foo');
-$command = '/usr/bin/crontab -u foo -l 2>&1'; `$command`;
+assert_path_does_not_exist("/var/spool/cron/crontabs/$name");
+$command = "/usr/bin/crontab -u $name -l 2>&1"; `$command`;
is($? >> 8, 1, "command failure: $command");
-$command = "/usr/bin/printf '* * * * * /bin/true\\n' | /usr/bin/crontab -u foo -"; system($command);
+$command = "/usr/bin/printf '* * * * * /bin/true\\n' | /usr/bin/crontab -u $name -"; system($command);
is($? >> 8, 0, "command success: $command");
-assert_path_exists('/var/spool/cron/crontabs/foo');
-$command = '/usr/bin/crontab -u foo -l 2>&1'; `$command`;
+assert_path_exists("/var/spool/cron/crontabs/$name");
+$command = "/usr/bin/crontab -u $name -l 2>&1"; `$command`;
is($? >> 8, 0, "command success: $command");
-assert_command_success('/usr/sbin/deluser',
+assert_command_success(
+ '/usr/sbin/deluser',
'--stdoutmsglevel=error', '--stderrmsglevel=error',
- 'foo');
-assert_user_does_not_exist('foo');
+ $name
+);
+assert_user_does_not_exist($name);
-assert_path_does_not_exist('/var/spool/cron/crontabs/foo');
-$command = '/usr/bin/crontab -u foo -l 2>&1'; `$command`;
+assert_path_does_not_exist("/var/spool/cron/crontabs/$name");
+$command = "/usr/bin/crontab -u $name -l 2>&1"; `$command`;
is($? >> 8, 1, "command failure: $command");
# vim: tabstop=4 shiftwidth=4 expandtab
=====================================
debian/tests/f/deluser_quiet.t
=====================================
@@ -5,24 +5,28 @@ use diagnostics;
use strict;
use warnings;
+my $name='duq';
+
use AdduserTestsCommon;
END {
- remove_tree('/home/foo');
- remove_tree('/var/mail/foo');
+ remove_tree("/home/$name");
+ remove_tree("/var/mail/$name");
}
-assert_user_does_not_exist('foo');
-assert_command_success('/usr/sbin/adduser',
+assert_user_does_not_exist($name);
+assert_command_success(
+ '/usr/sbin/adduser',
'--stdoutmsglevel=error', '--stderrmsglevel=error',
'--system',
- 'foo');
-assert_user_exists('foo');
+ $name
+);
+assert_user_exists($name);
-my $output = `/usr/sbin/deluser --stdoutmsglevel=error --stderrmsglevel=error foo 2>&1`;
+my $output = `/usr/sbin/deluser --stdoutmsglevel=error --stderrmsglevel=error $name 2>&1`;
is($output, '', 'option "--stdoutmsglevel=error" silences deluser output under normal use');
-assert_user_does_not_exist('foo');
+assert_user_does_not_exist($name);
# vim: tabstop=4 shiftwidth=4 expandtab
=====================================
debian/tests/f/disabled-login-password.t
=====================================
@@ -6,68 +6,82 @@ use warnings;
use AdduserTestsCommon;
+my $name1='ausdlp1';
+my $name2='ausdlp2';
+my $name3='ausdlp3';
+my $name4='ausdlp4';
END {
- remove_tree('/home/foo');
- remove_tree('/var/mail/foo');
+ remove_tree("/home/$name1");
+ remove_tree("/var/mail/$name1");
+ remove_tree("/home/$name2");
+ remove_tree("/var/mail/$name2");
}
my $uid;
# --- disabled-login
-assert_user_does_not_exist('disabledlogin');
+assert_user_does_not_exist($name1);
-assert_command_success('/usr/sbin/adduser',
+assert_command_success(
+ '/usr/sbin/adduser',
'--stdoutmsglevel=error', '--stderrmsglevel=error',
'--disabled-login',
'--comment', '',
- 'disabledlogin');
-assert_user_exists('disabledlogin');
+ $name1
+);
+assert_user_exists($name1);
-assert_user_has_login_shell('disabledlogin', '/usr/sbin/nologin');
-assert_user_has_disabled_password('disabledlogin');
+assert_user_has_login_shell($name1, '/usr/sbin/nologin');
+assert_user_has_disabled_password($name1);
# --- disabled-login with explicit shell
-assert_user_does_not_exist('disabledlogins');
+assert_user_does_not_exist($name2);
-assert_command_success('/usr/sbin/adduser',
+assert_command_success(
+ '/usr/sbin/adduser',
'--stdoutmsglevel=error', '--stderrmsglevel=error',
'--disabled-login',
'--comment', '',
'--shell', '/bin/sh',
- 'disabledlogins');
-assert_user_exists('disabledlogins');
+ $name2
+);
+assert_user_exists($name2);
-assert_user_has_login_shell('disabledlogins', '/bin/sh');
-assert_user_has_disabled_password('disabledlogins');
+assert_user_has_login_shell($name2, '/bin/sh');
+assert_user_has_disabled_password($name2);
# --- disabled-password
-assert_user_does_not_exist('disabledpassword');
+assert_user_does_not_exist($name3);
-assert_command_success('/usr/sbin/adduser',
+assert_command_success(
+ '/usr/sbin/adduser',
'--stdoutmsglevel=error', '--stderrmsglevel=error',
'--disabled-password',
'--comment', '',
- 'disabledpassword');
-assert_user_exists('disabledpassword');
+ $name3
+);
+assert_user_exists($name3);
-assert_user_has_login_shell('disabledpassword', '/bin/bash');
-assert_user_has_disabled_password('disabledpassword');
+assert_user_has_login_shell($name3, '/bin/bash');
+assert_user_has_disabled_password($name3);
# --- disabled-password with explicit shell
-assert_user_does_not_exist('disabledpasswords');
+assert_user_does_not_exist($name4);
-assert_command_success('/usr/sbin/adduser',
+assert_command_success(
+ '/usr/sbin/adduser',
'--stdoutmsglevel=error', '--stderrmsglevel=error',
'--disabled-password',
'--comment', '',
'--shell', '/bin/bash',
- 'disabledpasswords');
-assert_user_exists('disabledpasswords');
+ $name4
+);
+assert_user_exists($name4);
-assert_user_has_login_shell('disabledpasswords', '/bin/bash');
-assert_user_has_disabled_password('disabledpasswords');
+assert_user_has_login_shell($name4, '/bin/bash');
+assert_user_has_disabled_password($name4);
# vim: tabstop=4 shiftwidth=4 expandtab
=====================================
debian/tests/f/locks.t
=====================================
@@ -8,21 +8,24 @@ use Fcntl qw(:flock SEEK_END);
use AdduserTestsCommon;
+my $name1='auslocks1';
+my $name2='auslocks2';
+
my $lockfile;
ok(open($lockfile, '>>', '/run/adduser'), 'open lockfile');
ok(flock($lockfile, LOCK_EX), 'lock established');
assert_path_exists('/run/adduser', 'lockfile exists');
-assert_command_failure_silent('/usr/bin/adduser', '--system', 'foo');
-assert_command_failure_silent('/usr/bin/addgroup', '--system', 'bar');
-assert_command_failure_silent('/usr/bin/adduser', 'foo', 'bar');
-assert_command_failure_silent('/usr/bin/adduser', '--system', 'foo');
-assert_command_failure_silent('/usr/bin/deluser', '--system', 'foo');
+assert_command_failure_silent('/usr/bin/adduser', '--system', $name1);
+assert_command_failure_silent('/usr/bin/addgroup', '--system', $name2);
+assert_command_failure_silent('/usr/bin/adduser', $name1, $name2);
+assert_command_failure_silent('/usr/bin/adduser', '--system', $name1);
+assert_command_failure_silent('/usr/bin/deluser', '--system', $name1);
ok(flock($lockfile, LOCK_UN), 'lock released');
assert_command_success('rm', '-f', '/run/adduser');
assert_command_success('mkdir', '/run/adduser');
-assert_command_failure_silent('/usr/bin/adduser', '--system', 'foo');
+assert_command_failure_silent('/usr/bin/adduser', '--system', $name1);
assert_command_success('rmdir', '/run/adduser');
close($lockfile);
=====================================
debian/tests/f/quiet.t
=====================================
@@ -9,39 +9,42 @@ use warnings;
use AdduserTestsCommon;
+my $name='ausquiet';
END {
- remove_tree('/var/mail/foo');
+ remove_tree("/var/mail/$name");
}
-assert_user_does_not_exist('foo');
-assert_group_does_not_exist('foo');
+assert_user_does_not_exist($name);
+assert_group_does_not_exist($name);
-assert_command_success('/usr/sbin/adduser',
+assert_command_success(
+ '/usr/sbin/adduser',
'--stdoutmsglevel=error', '--stderrmsglevel=error',
'--disabled-login',
- '--comment="x"',
+ '--comment', '""',
'--no-create-home',
- 'foo');
+ $name
+);
-assert_user_exists('foo');
-assert_group_exists('foo');
-assert_path_does_not_exist('/home/foo');
+assert_user_exists($name);
+assert_group_exists($name);
+assert_path_does_not_exist("/home/$name");
-assert_group_membership_exists('foo', 'foo');
-assert_primary_group_membership_exists('foo', 'foo');
+assert_group_membership_exists($name, $name);
+assert_primary_group_membership_exists($name, $name);
-assert_group_membership_does_not_exist('foo', 'adm');
+assert_group_membership_does_not_exist($name, 'adm');
-my $command = '/usr/sbin/adduser --stdoutmsglevel=error --stderrmsglevel=error foo adm 2>&1';
+my $command = "/usr/sbin/adduser --stdoutmsglevel=error --stderrmsglevel=error $name adm 2>&1";
my $output = `$command`;
is($? >> 8, 0, "command success: $command");
is($output, '', 'option "--stdoutmsglevel=error" silences output when adding user to group');
-assert_group_membership_exists('foo', 'adm');
+assert_group_membership_exists($name, 'adm');
-assert_primary_group_membership_exists('foo', 'foo');
-assert_supplementary_group_membership_exists('foo', 'adm');
+assert_primary_group_membership_exists($name, $name);
+assert_supplementary_group_membership_exists($name, 'adm');
# vim: tabstop=4 shiftwidth=4 expandtab
View it on GitLab: https://salsa.debian.org/debian/adduser/-/compare/5a95e6705a26f0f1e923bf91d4e45a6e0e8d5022...1e62d96b14dd94045eae5bee04db3c4858ec039a
--
View it on GitLab: https://salsa.debian.org/debian/adduser/-/compare/5a95e6705a26f0f1e923bf91d4e45a6e0e8d5022...1e62d96b14dd94045eae5bee04db3c4858ec039a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-shadow-devel/attachments/20250308/15779fb3/attachment-0001.htm>
More information about the Pkg-shadow-devel
mailing list