s3:torture: Don't use the same testdir twice
authorAndreas Schneider <asn@samba.org>
Fri, 19 Oct 2018 12:38:34 +0000 (14:38 +0200)
committerVolker Lendecke <vl@samba.org>
Sat, 27 Oct 2018 19:24:23 +0000 (21:24 +0200)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/torture/torture.c

index 18f6917af0c78664454806932ab96de1bed09f91..71ff4d60f3626568d1c6f6f0d8eabcf9cebe92cb 100644 (file)
@@ -9758,8 +9758,8 @@ https://bugzilla.samba.org/show_bug.cgi?id=7084
 static bool run_dir_createtime(int dummy)
 {
        struct cli_state *cli;
-       const char *dname = "\\testdir";
-       const char *fname = "\\testdir\\testfile";
+       const char *dname = "\\testdir_createtime";
+       const char *fname = "\\testdir_createtime\\testfile";
        NTSTATUS status;
        struct timespec create_time;
        struct timespec create_time1;
@@ -9826,9 +9826,9 @@ static bool run_dir_createtime(int dummy)
 static bool run_streamerror(int dummy)
 {
        struct cli_state *cli;
-       const char *dname = "\\testdir";
+       const char *dname = "\\testdir_streamerror";
        const char *streamname =
-               "testdir:{4c8cc155-6c1e-11d1-8e41-00c04fb9386d}:$DATA";
+               "testdir_streamerror:{4c8cc155-6c1e-11d1-8e41-00c04fb9386d}:$DATA";
        NTSTATUS status;
        time_t change_time, access_time, write_time;
        off_t size;
@@ -9839,7 +9839,7 @@ static bool run_streamerror(int dummy)
                return false;
        }
 
-       cli_unlink(cli, "\\testdir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli, "\\testdir_streamerror\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        cli_rmdir(cli, dname);
 
        status = cli_mkdir(cli, dname);