summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2021-12-02 14:16:38 -0800
committerRalph Boehme <slow@samba.org>2021-12-09 18:06:35 +0000
commit5a802ae2d314e3a8558894f516f61ecf85a256aa (patch)
tree3a592701289915c1abcc6cee41d1cbb1f8594f91
parent1eeabbf8401b576b96723dd714d6993b096f6ed3 (diff)
downloadsamba-5a802ae2d314e3a8558894f516f61ecf85a256aa.tar.gz
s3: torture: In torture_chkpath_test(), use torture_deltree() for setup and cleanup.
Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
-rw-r--r--source3/torture/torture.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 634e84d6a9c..fb057ba67ee 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -9977,9 +9977,7 @@ bool torture_chkpath_test(int dummy)
printf("starting chkpath test\n");
/* cleanup from an old run */
- cli_rmdir(cli, "\\chkpath.dir\\dir2");
- cli_unlink(cli, "\\chkpath.dir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
- cli_rmdir(cli, "\\chkpath.dir");
+ torture_deltree(cli, "\\chkpath.dir");
status = cli_mkdir(cli, "\\chkpath.dir");
if (!NT_STATUS_IS_OK(status)) {
@@ -10040,9 +10038,7 @@ bool torture_chkpath_test(int dummy)
ret = False;
}
- cli_rmdir(cli, "\\chkpath.dir\\dir2");
- cli_unlink(cli, "\\chkpath.dir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
- cli_rmdir(cli, "\\chkpath.dir");
+ torture_deltree(cli, "\\chkpath.dir");
if (!torture_close_connection(cli)) {
return False;