s3: torture: In run_smb1_wild_mangle_rename_test() use torture_deltree() for setup...
authorJeremy Allison <jra@samba.org>
Wed, 1 Dec 2021 21:51:12 +0000 (13:51 -0800)
committerRalph Boehme <slow@samba.org>
Thu, 9 Dec 2021 18:06:35 +0000 (18:06 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/torture/torture.c

index c03c5b953b1d10c23a26d0e2b1d9f0b39e431709..634e84d6a9c9e8b9c457ff6ff38bd302855c408f 100644 (file)
@@ -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;