From: Jeremy Allison <jra@samba.org>
Date: Thu, 2 Dec 2021 22:16:38 +0000 (-0800)
Subject: s3: torture: In torture_chkpath_test(), use torture_deltree() for setup and cleanup.
X-Git-Tag: tdb-1.4.6~403
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a802ae2d314e3a8558894f516f61ecf85a256aa;p=thirdparty%2Fsamba.git

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>
---

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;