Revert "pass w2016 and make test"

This reverts commit a6dc13f479d51e8dabafa4613f8b7eddeca5495e.

diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c
index 4756ca587f937e52e91a3fb0e72b7b0c974d069c..aa971c557d4c4bbb0f98ed57efa72871a715d13b 100644 (file)
--- a/source4/torture/smb2/notify.c
+++ b/source4/torture/smb2/notify.c
@@ -114,7 +114,7 @@ static bool test_valid_request(struct torture_context *torture,
                }
        }
 
-       status = torture_setup_simple_file(torture, tree, FNAME);
+       status = torture_setup_complex_file(torture, tree, FNAME);
        CHECK_STATUS(status, NT_STATUS_OK);
 
        status = smb2_notify_recv(req, torture, &n);
@@ -136,7 +136,7 @@ static bool test_valid_request(struct torture_context *torture,
                }
        }
 
-       status = torture_setup_simple_file(torture, tree, FNAME);
+       status = torture_setup_complex_file(torture, tree, FNAME);
        CHECK_STATUS(status, NT_STATUS_OK);
 
        status = smb2_notify_recv(req, torture, &n);
@@ -155,7 +155,7 @@ static bool test_valid_request(struct torture_context *torture,
                }
        }
 
-       status = torture_setup_simple_file(torture, tree, FNAME);
+       status = torture_setup_complex_file(torture, tree, FNAME);
        CHECK_STATUS(status, NT_STATUS_OK);
 
        status = smb2_notify_recv(req, torture, &n);
@@ -187,7 +187,7 @@ static bool test_valid_request(struct torture_context *torture,
                }
        }
 
-       status = torture_setup_simple_file(torture, tree, FNAME);
+       status = torture_setup_complex_file(torture, tree, FNAME);
        CHECK_STATUS(status, NT_STATUS_OK);
 
        status = smb2_notify_recv(req, torture, &n);
@@ -201,7 +201,7 @@ static bool test_valid_request(struct torture_context *torture,
                }
        }
 
-       status = torture_setup_simple_file(torture, tree, FNAME);
+       status = torture_setup_complex_file(torture, tree, FNAME);
        CHECK_STATUS(status, NT_STATUS_OK);
 
        status = smb2_notify_recv(req, torture, &n);
@@ -1079,7 +1079,7 @@ static bool torture_smb2_notify_mask(struct torture_context *torture,
                sinfo.basic_info.in.create_time = 0;
                torture_comment(torture, "Testing set file create time\n");
                NOTIFY_MASK_TEST("Testing set file create time",
-                       smb2_create_simple_file(torture, tree2,
+                       smb2_create_complex_file(torture, tree2,
                        BASEDIR_MSK "\\tname1", &h2);,
                        smb2_setinfo_file(tree2, &sinfo);,
                        (smb2_util_close(tree2, h2),
@@ -1094,7 +1094,7 @@ static bool torture_smb2_notify_mask(struct torture_context *torture,
        sinfo.basic_info.in.access_time = 0;
        torture_comment(torture, "Testing set file access time\n");
        NOTIFY_MASK_TEST("Testing set file access time",
-               smb2_create_simple_file(torture,
+               smb2_create_complex_file(torture,
                        tree2,
                        BASEDIR_MSK "\\tname1",
                        &h2);,
@@ -1110,7 +1110,7 @@ static bool torture_smb2_notify_mask(struct torture_context *torture,
        sinfo.basic_info.in.change_time = 0;
        torture_comment(torture, "Testing set file change time\n");
        NOTIFY_MASK_TEST("Testing set file change time",
-               smb2_create_simple_file(torture,
+               smb2_create_complex_file(torture,
                        tree2,
                        BASEDIR_MSK "\\tname1",
                        &h2);,
@@ -1123,7 +1123,7 @@ static bool torture_smb2_notify_mask(struct torture_context *torture,
 
        torture_comment(torture, "Testing write\n");
        NOTIFY_MASK_TEST("Testing write",
-               smb2_create_simple_file(torture,
+               smb2_create_complex_file(torture,
                        tree2,
                        BASEDIR_MSK "\\tname1",
                        &h2);,
@@ -2656,18 +2656,14 @@ struct torture_suite *torture_smb2_notify_init(TALLOC_CTX *ctx)
 {
        struct torture_suite *suite = torture_suite_create(ctx, "notify");
 
-if (1) {
        torture_suite_add_1smb2_test(suite, "valid-req", test_valid_request);
+if (0) {
        torture_suite_add_1smb2_test(suite, "tcon", torture_smb2_notify_tcon);
        torture_suite_add_2smb2_test(suite, "dir", torture_smb2_notify_dir);
        torture_suite_add_2smb2_test(suite, "mask", torture_smb2_notify_mask);
        torture_suite_add_1smb2_test(suite, "tdis", torture_smb2_notify_tree_disconnect);
        torture_suite_add_1smb2_test(suite, "tdis1", torture_smb2_notify_tree_disconnect_1);
-}
-if (0) {
        torture_suite_add_2smb2_test(suite, "mask-change", torture_smb2_notify_mask_change);
-}
-if (1) {
        torture_suite_add_1smb2_test(suite, "close", torture_smb2_notify_close);
        torture_suite_add_1smb2_test(suite, "logoff", torture_smb2_notify_ulogoff);
        torture_suite_add_1smb2_test(suite, "session-reconnect", torture_smb2_notify_session_reconnect);