[LTP] [PATCH] syscalls/add_key05: Add userdel and groupdel before useradd

[zhaogongyi]

Hi,

Thanks for your review! I have resubmit the patch as your suggestions. Please see: https://patchwork.ozlabs.org/project/ltp/patch/20221011124630.62647-1-zhaogongyi@huawei.com/

Regards,
Gongyi

> 
> Hi Zhao
> 
> > If the test exit abnormal, some user/group will be left, and the next
> > running of the test will fail and report:
> >
> >    tst_buffers.c:55: TINFO: Test is using guarded buffers
> >    tst_test.c:1526: TINFO: Timeout per run is 0h 00m 30s
> >    useradd: group ltp_add_key05_0 exists - if you want to add this user
> to that group, use -g.
> >    add_key05.c:41: TBROK: useradd failed (9)
> >    userdel: user 'ltp_add_key05_0' does not exist
> >    add_key05.c:56: TWARN: 'userdel -r ltp_add_key05_0' failed:
> ENOENT
> > (2)
> >
> > Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
> > ---
> >   testcases/kernel/syscalls/add_key/add_key05.c | 5 +++++
> >   1 file changed, 5 insertions(+)
> >
> > diff --git a/testcases/kernel/syscalls/add_key/add_key05.c
> > b/testcases/kernel/syscalls/add_key/add_key05.c
> > index 71a88d1a8..42ad04eec 100644
> > --- a/testcases/kernel/syscalls/add_key/add_key05.c
> > +++ b/testcases/kernel/syscalls/add_key/add_key05.c
> > @@ -34,8 +34,13 @@ static void add_user(char n)
> >   {
> >   	char username[] = "ltp_add_key05_n";
> >   	const char *const cmd_useradd[] = {"useradd", username,
> NULL};
> > +	const char *const cmd_userdel[] = {"userdel", "-r", username, NULL};
> > +	const char *const cmd_groupdel[] = {"groupdel", username, NULL};
> >   	struct passwd *pw;
> >
> > +	tst_cmd(cmd_userdel, NULL, NULL, TST_CMD_PASS_RETVAL);
> > +	tst_cmd(cmd_groupdel, NULL, NULL, TST_CMD_PASS_RETVAL);
> If so, it always uses ltp_add_key05_n instead of ltp_add_key05_0 or 1.
> 
> tst_buffers.c:55: TINFO: Test is using guarded buffers
> tst_test.c:1528: TINFO: Timeout per run is 0h 00m 30s
> userdel: user 'ltp_add_key05_n' does not exist
> groupdel: group 'ltp_add_key05_n' does not exist
> add_key05.c:49: TINFO: Created user ltp_add_key05_0
> add_key05.c:190: TINFO: User: 0, UID: 1005
> add_key05.c:87: TINFO: test max bytes under unprivileged user
> add_key05.c:112: TPASS: add_key(test_inv) failed as expected: EDQUOT
> (122)
> add_key05.c:135: TPASS: add_key(test_max) succeeded as expected
> add_key05.c:138: TPASS: allow reaching the max bytes exactly
> userdel: user 'ltp_add_key05_n' does not exist
> groupdel: group 'ltp_add_key05_n' does not exist
> add_key05.c:49: TINFO: Created user ltp_add_key05_1
> add_key05.c:190: TINFO: User: 1, UID: 1006
> add_key05.c:148: TINFO: test max keys under unprivileged user
> add_key05.c:166: TPASS: add_key(test_invalid_key) failed as expected:
> EDQUOT (122)
> add_key05.c:173: TPASS: allow reaching the max key(200) exactly
> 
> 
> Also, I think we should ignore this "userdel: user 'ltp_add_key05_n'
> does not exist" noise on those system that doesn't hit this problem.
> 
> So  we can use  tst_cmd(cmd_userdel, NULL, "/dev/null",
> TST_CMD_PASS_RETVAL).
> 
> Best Regards
> Yang Xu
> > +
> >   	username[sizeof(username) - 2] = '0' + n;
> >
> >   	SAFE_CMD(cmd_useradd, NULL, NULL);
> > --
> > 2.17.1
> >
> >