From: Jeremy Allison <jra@samba.org>
Date: Wed, 1 Dec 2021 21:51:12 +0000 (-0800)
Subject: s3: torture: In run_smb1_wild_mangle_rename_test() use torture_deltree() for setup... 
X-Git-Tag: tdb-1.4.6~406
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ffc03d5e7d517957fcf4fe26d7ba423ef02a306;p=thirdparty%2Fsamba.git

s3: torture: In run_smb1_wild_mangle_rename_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 c03c5b953b1..634e84d6a9c 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -13016,10 +13016,7 @@ static bool run_smb1_wild_mangle_rename_test(int dummy)
 	smbXcli_conn_set_sockopt(cli->conn, sockops);
 
 	/* Ensure we start from fresh. */
-	cli_unlink(cli,
-		wild_name,
-		FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
-	cli_posix_rmdir(cli_posix, dname);
+	torture_deltree(cli, dname);
 
 	/*
 	 * Create two files - 'foo' and 'fo*'.
@@ -13138,13 +13135,10 @@ static bool run_smb1_wild_mangle_rename_test(int dummy)
 	TALLOC_FREE(windows_rename_src);
 
 	if (cli != NULL) {
-		cli_unlink(cli,
-			wild_name,
-			FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+		torture_deltree(cli, dname);
 		torture_close_connection(cli);
 	}
 
-	cli_posix_rmdir(cli_posix, dname);
 	torture_close_connection(cli_posix);
 
 	return correct;