s4:torture: Use C99 initializers for levels in raw notify test
[kai/samba-autobuild/.git] / source4 / torture / raw / notify.c
index d7541b7c7132c689cab2876e1904b5f590c71b1c..423721aa61b1c75e5691cbfa46a14358bac17d94 100644 (file)
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "libcli/libcli.h"
 #include "system/filesys.h"
 #include "torture/util.h"
-#include "param/param.h"
+#include "torture/raw/proto.h"
+#include "lib/events/events.h"
 
 #define BASEDIR "\\test_notify"
 
-#define CHECK_STATUS(status, correct) do { \
-       if (!NT_STATUS_EQUAL(status, correct)) { \
-               printf("(%d) Incorrect status %s - should be %s\n", \
-                      __LINE__, nt_errstr(status), nt_errstr(correct)); \
-               ret = false; \
-               goto done; \
-       }} while (0)
-
-
-#define CHECK_VAL(v, correct) do { \
-       if ((v) != (correct)) { \
-               printf("(%d) wrong value for %s  0x%x should be 0x%x\n", \
-                      __LINE__, #v, (int)v, (int)correct); \
-               ret = false; \
-               goto done; \
-       }} while (0)
-
-#define CHECK_WSTR(field, value, flags) do { \
-       if (!field.s || strcmp(field.s, value) || wire_bad_flags(&field, flags, cli->transport)) { \
-               printf("(%d) %s [%s] != %s\n",  __LINE__, #field, field.s, value); \
-                       ret = false; \
-               goto done; \
-       }} while (0)
+#define CHECK_WSTR(tctx, field, value, flags) \
+do { \
+       torture_assert_str_equal(tctx, field.s, value, "values don't match"); \
+       torture_assert(tctx, \
+                      !wire_bad_flags(&field, STR_UNICODE, cli->transport), \
+                      "wire_bad_flags"); \
+} while (0)
 
+#define BASEDIR_CN1_DIR BASEDIR "_CN1_DIR"
 
 /* 
    basic testing of change notify on directories
 */
-static bool test_notify_dir(struct smbcli_state *cli, struct smbcli_state *cli2, 
-                           TALLOC_CTX *mem_ctx)
+static bool test_notify_dir(struct torture_context *tctx,
+                           struct smbcli_state *cli,
+                           struct smbcli_state *cli2)
 {
        bool ret = true;
        NTSTATUS status;
@@ -68,13 +54,16 @@ static bool test_notify_dir(struct smbcli_state *cli, struct smbcli_state *cli2,
        struct smbcli_request *req, *req2;
        extern int torture_numops;
 
-       printf("TESTING CHANGE NOTIFY ON DIRECTRIES\n");
-               
+       torture_comment(tctx, "TESTING CHANGE NOTIFY ON DIRECTORIES\n");
+
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR_CN1_DIR),
+                      "Failed to setup up test directory: " BASEDIR_CN1_DIR);
+
        /*
          get a handle on the directory
        */
        io.generic.level = RAW_OPEN_NTCREATEX;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.flags = 0;
        io.ntcreatex.in.access_mask = SEC_FILE_ALL;
        io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
@@ -84,14 +73,16 @@ static bool test_notify_dir(struct smbcli_state *cli, struct smbcli_state *cli2,
        io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
        io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
        io.ntcreatex.in.security_flags = 0;
-       io.ntcreatex.in.fname = BASEDIR;
+       io.ntcreatex.in.fname = BASEDIR_CN1_DIR;
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
        fnum = io.ntcreatex.out.file.fnum;
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
        fnum2 = io.ntcreatex.out.file.fnum;
 
        /* ask for a change notify,
@@ -102,67 +93,98 @@ static bool test_notify_dir(struct smbcli_state *cli, struct smbcli_state *cli2,
        notify.nttrans.in.file.fnum = fnum;
        notify.nttrans.in.recursive = true;
 
-       printf("testing notify cancel\n");
+       torture_comment(tctx, "Testing notify cancel\n");
 
        req = smb_raw_changenotify_send(cli->tree, &notify);
        smb_raw_ntcancel(req);
-       status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_CANCELLED);
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_equal_goto(tctx, status, NT_STATUS_CANCELLED,
+                                          ret, done,
+                                          "smb_raw_changenotify_recv");
 
-       printf("testing notify mkdir\n");
+       torture_comment(tctx, "Testing notify mkdir\n");
 
        req = smb_raw_changenotify_send(cli->tree, &notify);
-       smbcli_mkdir(cli2->tree, BASEDIR "\\subdir-name");
+       smbcli_mkdir(cli2->tree, BASEDIR_CN1_DIR "\\subdir-name");
 
-       status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
 
-       CHECK_VAL(notify.nttrans.out.num_changes, 1);
-       CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_ADDED);
-       CHECK_WSTR(notify.nttrans.out.changes[0].name, "subdir-name", STR_UNICODE);
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "more than one change");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_ADDED, ret, done,
+                                     "wrong action (exp: ADDED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subdir-name",
+                  STR_UNICODE);
 
-       printf("testing notify rmdir\n");
+       torture_comment(tctx, "Testing notify rmdir\n");
 
        req = smb_raw_changenotify_send(cli->tree, &notify);
-       smbcli_rmdir(cli2->tree, BASEDIR "\\subdir-name");
+       smbcli_rmdir(cli2->tree, BASEDIR_CN1_DIR "\\subdir-name");
 
-       status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VAL(notify.nttrans.out.num_changes, 1);
-       CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_REMOVED);
-       CHECK_WSTR(notify.nttrans.out.changes[0].name, "subdir-name", STR_UNICODE);
-
-       printf("testing notify mkdir - rmdir - mkdir - rmdir\n");
-
-       smbcli_mkdir(cli2->tree, BASEDIR "\\subdir-name");
-       smbcli_rmdir(cli2->tree, BASEDIR "\\subdir-name");
-       smbcli_mkdir(cli2->tree, BASEDIR "\\subdir-name");
-       smbcli_rmdir(cli2->tree, BASEDIR "\\subdir-name");
-       msleep(200);
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "more than one change");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_REMOVED, ret, done,
+                                     "wrong action (exp: REMOVED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subdir-name",
+                  STR_UNICODE);
+
+       torture_comment(tctx, "Testing notify mkdir - rmdir - mkdir - rmdir\n");
+
+       smbcli_mkdir(cli2->tree, BASEDIR_CN1_DIR "\\subdir-name");
+       smbcli_rmdir(cli2->tree, BASEDIR_CN1_DIR "\\subdir-name");
+       smbcli_mkdir(cli2->tree, BASEDIR_CN1_DIR "\\subdir-name");
+       smbcli_rmdir(cli2->tree, BASEDIR_CN1_DIR "\\subdir-name");
+       smb_msleep(200);
        req = smb_raw_changenotify_send(cli->tree, &notify);
-       status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VAL(notify.nttrans.out.num_changes, 4);
-       CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_ADDED);
-       CHECK_WSTR(notify.nttrans.out.changes[0].name, "subdir-name", STR_UNICODE);
-       CHECK_VAL(notify.nttrans.out.changes[1].action, NOTIFY_ACTION_REMOVED);
-       CHECK_WSTR(notify.nttrans.out.changes[1].name, "subdir-name", STR_UNICODE);
-       CHECK_VAL(notify.nttrans.out.changes[2].action, NOTIFY_ACTION_ADDED);
-       CHECK_WSTR(notify.nttrans.out.changes[2].name, "subdir-name", STR_UNICODE);
-       CHECK_VAL(notify.nttrans.out.changes[3].action, NOTIFY_ACTION_REMOVED);
-       CHECK_WSTR(notify.nttrans.out.changes[3].name, "subdir-name", STR_UNICODE);
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     4, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_ADDED, ret, done,
+                                     "wrong action (exp: ADDED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subdir-name",
+                  STR_UNICODE);
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[1].action,
+                                     NOTIFY_ACTION_REMOVED, ret, done,
+                                     "wrong action (exp: REMOVED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[1].name, "subdir-name",
+                  STR_UNICODE);
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[2].action,
+                                     NOTIFY_ACTION_ADDED, ret, done,
+                                     "wrong action (exp: ADDED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[2].name, "subdir-name",
+                  STR_UNICODE);
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[3].action,
+                                     NOTIFY_ACTION_REMOVED, ret, done,
+                                     "wrong action (exp: REMOVED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[3].name, "subdir-name",
+                  STR_UNICODE);
 
        count = torture_numops;
-       printf("testing buffered notify on create of %d files\n", count);
+       torture_comment(tctx, "Testing buffered notify on create of %d files\n", count);
        for (i=0;i<count;i++) {
-               char *fname = talloc_asprintf(cli, BASEDIR "\\test%d.txt", i);
+               char *fname = talloc_asprintf(cli,
+                               BASEDIR_CN1_DIR "\\test%d.txt",
+                               i);
                int fnum3 = smbcli_open(cli->tree, fname, O_CREAT|O_RDWR, DENY_NONE);
-               if (fnum3 == -1) {
-                       printf("Failed to create %s - %s\n", 
-                              fname, smbcli_errstr(cli->tree));
-                       ret = false;
-                       goto done;
-               }
+               torture_assert_int_not_equal_goto(tctx, fnum3, -1, ret, done,
+                       talloc_asprintf(tctx, "Failed to create %s - %s",
+                                       fname, smbcli_errstr(cli->tree)));
                talloc_free(fname);
                smbcli_close(cli->tree, fnum3);
        }
@@ -177,71 +199,110 @@ static bool test_notify_dir(struct smbcli_state *cli, struct smbcli_state *cli2,
        notify.nttrans.in.file.fnum = fnum;
        req = smb_raw_changenotify_send(cli->tree, &notify);
 
-       status = smbcli_unlink(cli->tree, BASEDIR "\\nonexistant.txt");
-       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+       status = smbcli_unlink(cli->tree, BASEDIR_CN1_DIR "\\nonexistent.txt");
+       torture_assert_ntstatus_equal_goto(tctx, status,
+                                          NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                                          ret, done,
+                                          "smbcli_unlink");
 
        /* (1st unlink) as the 2nd notify directly returns,
           this unlink is only seen by the 1st notify and 
           the 3rd notify (later) */
-       printf("testing notify on unlink for the first file\n");
-       status = smbcli_unlink(cli2->tree, BASEDIR "\\test0.txt");
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_comment(tctx, "Testing notify on unlink for the first file\n");
+       status = smbcli_unlink(cli2->tree, BASEDIR_CN1_DIR "\\test0.txt");
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smbcli_unlink");
 
        /* receive the reply from the 2nd notify */
-       status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
 
-       CHECK_VAL(notify.nttrans.out.num_changes, count);
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     count, ret, done,
+                                     "wrong number of changes");
        for (i=1;i<count;i++) {
-               CHECK_VAL(notify.nttrans.out.changes[i].action, NOTIFY_ACTION_ADDED);
+               torture_assert_int_equal_goto(tctx,
+                                       notify.nttrans.out.changes[i].action,
+                                       NOTIFY_ACTION_ADDED, ret, done,
+                                       "wrong action (exp: ADDED)");
        }
-       CHECK_WSTR(notify.nttrans.out.changes[0].name, "test0.txt", STR_UNICODE);
-
-       printf("and now from the 1st notify\n");
-       status = smb_raw_changenotify_recv(req2, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VAL(notify.nttrans.out.num_changes, 1);
-       CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_REMOVED);
-       CHECK_WSTR(notify.nttrans.out.changes[0].name, "test0.txt", STR_UNICODE);
-
-       printf("(3rd notify) this notify will only see the 1st unlink\n");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "test0.txt",
+                  STR_UNICODE);
+
+       torture_comment(tctx, "and now from the 1st notify\n");
+       status = smb_raw_changenotify_recv(req2, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_REMOVED, ret, done,
+                                     "wrong action (exp: REMOVED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "test0.txt",
+                  STR_UNICODE);
+
+       torture_comment(tctx, "(3rd notify) this notify will only see the 1st unlink\n");
        req = smb_raw_changenotify_send(cli->tree, &notify);
 
-       status = smbcli_unlink(cli->tree, BASEDIR "\\nonexistant.txt");
-       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+       status = smbcli_unlink(cli->tree, BASEDIR_CN1_DIR "\\nonexistent.txt");
+       torture_assert_ntstatus_equal_goto(tctx, status,
+                                          NT_STATUS_OBJECT_NAME_NOT_FOUND,
+                                          ret, done,
+                                          "smbcli_unlink");
 
-       printf("testing notify on wildcard unlink for %d files\n", count-1);
+       torture_comment(tctx, "Testing notify on wildcard unlink for %d files\n", count-1);
        /* (2nd unlink) do a wildcard unlink */
-       status = smbcli_unlink(cli2->tree, BASEDIR "\\test*.txt");
-       CHECK_STATUS(status, NT_STATUS_OK);
+       status = smbcli_unlink(cli2->tree, BASEDIR_CN1_DIR "\\test*.txt");
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
 
        /* receive the 3rd notify */
-       status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VAL(notify.nttrans.out.num_changes, 1);
-       CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_REMOVED);
-       CHECK_WSTR(notify.nttrans.out.changes[0].name, "test0.txt", STR_UNICODE);
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_REMOVED, ret, done,
+                                     "wrong action (exp: REMOVED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "test0.txt",
+                  STR_UNICODE);
 
        /* and we now see the rest of the unlink calls on both directory handles */
        notify.nttrans.in.file.fnum = fnum;
        sleep(3);
        req = smb_raw_changenotify_send(cli->tree, &notify);
-       status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VAL(notify.nttrans.out.num_changes, count-1);
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     count - 1, ret, done,
+                                     "wrong number of changes");
        for (i=0;i<notify.nttrans.out.num_changes;i++) {
-               CHECK_VAL(notify.nttrans.out.changes[i].action, NOTIFY_ACTION_REMOVED);
+               torture_assert_int_equal_goto(tctx,
+                                       notify.nttrans.out.changes[i].action,
+                                       NOTIFY_ACTION_REMOVED, ret, done,
+                                       "wrong action (exp: REMOVED)");
        }
        notify.nttrans.in.file.fnum = fnum2;
        req = smb_raw_changenotify_send(cli->tree, &notify);
-       status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VAL(notify.nttrans.out.num_changes, count-1);
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     count - 1, ret, done,
+                                     "wrong number of changes");
        for (i=0;i<notify.nttrans.out.num_changes;i++) {
-               CHECK_VAL(notify.nttrans.out.changes[i].action, NOTIFY_ACTION_REMOVED);
+               torture_assert_int_equal_goto(tctx,
+                                       notify.nttrans.out.changes[i].action,
+                                       NOTIFY_ACTION_REMOVED, ret, done,
+                                       "wrong action (exp: REMOVED)");
        }
 
-       printf("testing if a close() on the dir handle triggers the notify reply\n");
+       torture_comment(tctx, "Testing if a close() on the dir handle triggers the notify reply\n");
 
        notify.nttrans.in.file.fnum = fnum;
        req = smb_raw_changenotify_send(cli->tree, &notify);
@@ -250,14 +311,18 @@ static bool test_notify_dir(struct smbcli_state *cli, struct smbcli_state *cli2,
        cl.close.in.file.fnum = fnum;
        cl.close.in.write_time = 0;
        status = smb_raw_close(cli->tree, &cl);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_close");
 
-       status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VAL(notify.nttrans.out.num_changes, 0);
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     0, ret, done, "no changes expected");
 
 done:
        smb_raw_exit(cli->session);
+       smbcli_deltree(cli->tree, BASEDIR_CN1_DIR);
        return ret;
 }
 
@@ -268,7 +333,8 @@ done:
  * pair in any of the three following notify_changes.
  */
 
-static bool check_rename_reply(struct smbcli_state *cli,
+static bool check_rename_reply(struct torture_context *tctx,
+                              struct smbcli_state *cli,
                               int line,
                               struct notify_changes *actions,
                               uint32_t action, const char *name)
@@ -277,26 +343,26 @@ static bool check_rename_reply(struct smbcli_state *cli,
 
        for (i=0; i<3; i++) {
                if (actions[i].action == action) {
-                       if ((actions[i].name.s == NULL)
-                           || (strcmp(actions[i].name.s, name) != 0)
-                           || (wire_bad_flags(&actions[i].name, STR_UNICODE,
-                                              cli->transport))) {
-                               printf("(%d) name [%s] != %s\n", line,
-                                      actions[i].name.s, name);
-                               return false;
-                       }
+                       CHECK_WSTR(tctx, actions[i].name, name, STR_UNICODE);
                        return true;
                }
        }
 
-       printf("(%d) expected action %d, not found\n", line, action);
+       torture_result(tctx, TORTURE_FAIL,
+                      __location__": (%d) expected action %d, not found\n",
+                      line, action);
        return false;
 }
 
 /* 
    testing of recursive change notify
 */
-static bool test_notify_recursive(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+
+#define BASEDIR_CN1_RECUR BASEDIR "_CN1_RECUR"
+
+static bool test_notify_recursive(struct torture_context *tctx,
+                                 struct smbcli_state *cli,
+                                 struct smbcli_state *cli2)
 {
        bool ret = true;
        NTSTATUS status;
@@ -305,13 +371,16 @@ static bool test_notify_recursive(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        int fnum;
        struct smbcli_request *req1, *req2;
 
-       printf("TESTING CHANGE NOTIFY WITH RECURSION\n");
-               
+       torture_comment(tctx, "TESTING CHANGE NOTIFY WITH RECURSION\n");
+
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR_CN1_RECUR),
+                      "Failed to setup up test directory: " BASEDIR_CN1_RECUR);
+
        /*
          get a handle on the directory
        */
        io.generic.level = RAW_OPEN_NTCREATEX;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.flags = 0;
        io.ntcreatex.in.access_mask = SEC_FILE_ALL;
        io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
@@ -321,10 +390,11 @@ static bool test_notify_recursive(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
        io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
        io.ntcreatex.in.security_flags = 0;
-       io.ntcreatex.in.fname = BASEDIR;
+       io.ntcreatex.in.fname = BASEDIR_CN1_RECUR;
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
        fnum = io.ntcreatex.out.file.fnum;
 
        /* ask for a change notify, on file or directory name
@@ -342,65 +412,104 @@ static bool test_notify_recursive(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 
        /* cancel initial requests so the buffer is setup */
        smb_raw_ntcancel(req1);
-       status = smb_raw_changenotify_recv(req1, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_CANCELLED);
+       status = smb_raw_changenotify_recv(req1, tctx, &notify);
+       torture_assert_ntstatus_equal_goto(tctx, status,
+                                          NT_STATUS_CANCELLED,
+                                          ret, done,
+                                          "smb_raw_changenotify_recv");
 
        smb_raw_ntcancel(req2);
-       status = smb_raw_changenotify_recv(req2, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_CANCELLED);
+       status = smb_raw_changenotify_recv(req2, tctx, &notify);
+       torture_assert_ntstatus_equal_goto(tctx, status,
+                                          NT_STATUS_CANCELLED,
+                                          ret, done,
+                                          "smb_raw_changenotify_recv");
 
-       smbcli_mkdir(cli->tree, BASEDIR "\\subdir-name");
-       smbcli_mkdir(cli->tree, BASEDIR "\\subdir-name\\subname1");
+       /*
+        * Make notifies a bit more interesting in a cluster by doing
+        * the changes against different nodes with --unclist
+        */
+       smbcli_mkdir(cli->tree, BASEDIR_CN1_RECUR "\\subdir-name");
+       smbcli_mkdir(cli2->tree, BASEDIR_CN1_RECUR "\\subdir-name\\subname1");
        smbcli_close(cli->tree, 
-                    smbcli_open(cli->tree, BASEDIR "\\subdir-name\\subname2", O_CREAT, 0));
-       smbcli_rename(cli->tree, BASEDIR "\\subdir-name\\subname1", BASEDIR "\\subdir-name\\subname1-r");
-       smbcli_rename(cli->tree, BASEDIR "\\subdir-name\\subname2", BASEDIR "\\subname2-r");
-       smbcli_rename(cli->tree, BASEDIR "\\subname2-r", BASEDIR "\\subname3-r");
+                    smbcli_open(cli->tree,
+                               BASEDIR_CN1_RECUR "\\subdir-name\\subname2",
+                               O_CREAT, 0));
+       smbcli_rename(cli2->tree, BASEDIR_CN1_RECUR "\\subdir-name\\subname1",
+                     BASEDIR_CN1_RECUR "\\subdir-name\\subname1-r");
+       smbcli_rename(cli->tree,
+               BASEDIR_CN1_RECUR "\\subdir-name\\subname2",
+               BASEDIR_CN1_RECUR "\\subname2-r");
+       smbcli_rename(cli2->tree, BASEDIR_CN1_RECUR "\\subname2-r",
+                     BASEDIR_CN1_RECUR "\\subname3-r");
 
        notify.nttrans.in.completion_filter = 0;
        notify.nttrans.in.recursive = true;
-       msleep(200);
+       smb_msleep(200);
        req1 = smb_raw_changenotify_send(cli->tree, &notify);
 
-       smbcli_rmdir(cli->tree, BASEDIR "\\subdir-name\\subname1-r");
-       smbcli_rmdir(cli->tree, BASEDIR "\\subdir-name");
-       smbcli_unlink(cli->tree, BASEDIR "\\subname3-r");
+       smbcli_rmdir(cli->tree, BASEDIR_CN1_RECUR "\\subdir-name\\subname1-r");
+       smbcli_rmdir(cli2->tree, BASEDIR_CN1_RECUR "\\subdir-name");
+       smbcli_unlink(cli->tree, BASEDIR_CN1_RECUR "\\subname3-r");
 
+       smb_msleep(200);
        notify.nttrans.in.recursive = false;
        req2 = smb_raw_changenotify_send(cli->tree, &notify);
 
-       status = smb_raw_changenotify_recv(req1, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-
-       CHECK_VAL(notify.nttrans.out.num_changes, 11);
-       CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_ADDED);
-       CHECK_WSTR(notify.nttrans.out.changes[0].name, "subdir-name", STR_UNICODE);
-       CHECK_VAL(notify.nttrans.out.changes[1].action, NOTIFY_ACTION_ADDED);
-       CHECK_WSTR(notify.nttrans.out.changes[1].name, "subdir-name\\subname1", STR_UNICODE);
-       CHECK_VAL(notify.nttrans.out.changes[2].action, NOTIFY_ACTION_ADDED);
-       CHECK_WSTR(notify.nttrans.out.changes[2].name, "subdir-name\\subname2", STR_UNICODE);
-       CHECK_VAL(notify.nttrans.out.changes[3].action, NOTIFY_ACTION_OLD_NAME);
-       CHECK_WSTR(notify.nttrans.out.changes[3].name, "subdir-name\\subname1", STR_UNICODE);
-       CHECK_VAL(notify.nttrans.out.changes[4].action, NOTIFY_ACTION_NEW_NAME);
-       CHECK_WSTR(notify.nttrans.out.changes[4].name, "subdir-name\\subname1-r", STR_UNICODE);
-
-       ret &= check_rename_reply(
+       status = smb_raw_changenotify_recv(req1, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     11, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_ADDED, ret, done,
+                                     "wrong action (exp: ADDED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subdir-name",
+                  STR_UNICODE);
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[1].action,
+                                     NOTIFY_ACTION_ADDED, ret, done,
+                                     "wrong action (exp: ADDED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[1].name,
+                  "subdir-name\\subname1", STR_UNICODE);
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[2].action,
+                                     NOTIFY_ACTION_ADDED, ret, done,
+                                     "wrong action (exp: ADDED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[2].name,
+                  "subdir-name\\subname2", STR_UNICODE);
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[3].action,
+                                     NOTIFY_ACTION_OLD_NAME, ret, done,
+                                     "wrong action (exp: OLD_NAME)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[3].name,
+                  "subdir-name\\subname1", STR_UNICODE);
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[4].action,
+                                     NOTIFY_ACTION_NEW_NAME, ret, done,
+                                     "wrong action (exp: NEW_NAME)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[4].name,
+                  "subdir-name\\subname1-r", STR_UNICODE);
+
+       ret &= check_rename_reply(tctx,
                cli, __LINE__, &notify.nttrans.out.changes[5],
                NOTIFY_ACTION_ADDED, "subname2-r");
-       ret &= check_rename_reply(
+       ret &= check_rename_reply(tctx,
                cli, __LINE__, &notify.nttrans.out.changes[5],
                NOTIFY_ACTION_REMOVED, "subdir-name\\subname2");
-       ret &= check_rename_reply(
+       ret &= check_rename_reply(tctx,
                cli, __LINE__, &notify.nttrans.out.changes[5],
                NOTIFY_ACTION_MODIFIED, "subname2-r");
                
-       ret &= check_rename_reply(
+       ret &= check_rename_reply(tctx,
                cli, __LINE__, &notify.nttrans.out.changes[8],
                NOTIFY_ACTION_OLD_NAME, "subname2-r");
-       ret &= check_rename_reply(
+       ret &= check_rename_reply(tctx,
                cli, __LINE__, &notify.nttrans.out.changes[8],
                NOTIFY_ACTION_NEW_NAME, "subname3-r");
-       ret &= check_rename_reply(
+       ret &= check_rename_reply(tctx,
                cli, __LINE__, &notify.nttrans.out.changes[8],
                NOTIFY_ACTION_MODIFIED, "subname3-r");
 
@@ -408,26 +517,45 @@ static bool test_notify_recursive(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                goto done;
        }
 
-       status = smb_raw_changenotify_recv(req2, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-
-       CHECK_VAL(notify.nttrans.out.num_changes, 3);
-       CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_REMOVED);
-       CHECK_WSTR(notify.nttrans.out.changes[0].name, "subdir-name\\subname1-r", STR_UNICODE);
-       CHECK_VAL(notify.nttrans.out.changes[1].action, NOTIFY_ACTION_REMOVED);
-       CHECK_WSTR(notify.nttrans.out.changes[1].name, "subdir-name", STR_UNICODE);
-       CHECK_VAL(notify.nttrans.out.changes[2].action, NOTIFY_ACTION_REMOVED);
-       CHECK_WSTR(notify.nttrans.out.changes[2].name, "subname3-r", STR_UNICODE);
+       status = smb_raw_changenotify_recv(req2, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     3, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_REMOVED, ret, done,
+                                     "wrong action (exp: REMOVED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name,
+                  "subdir-name\\subname1-r", STR_UNICODE);
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[1].action,
+                                     NOTIFY_ACTION_REMOVED, ret, done,
+                                     "wrong action (exp: REMOVED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[1].name, "subdir-name",
+                  STR_UNICODE);
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[2].action,
+                                     NOTIFY_ACTION_REMOVED, ret, done,
+                                     "wrong action (exp: REMOVED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[2].name, "subname3-r",
+                  STR_UNICODE);
 
 done:
        smb_raw_exit(cli->session);
+       smbcli_deltree(cli->tree, BASEDIR_CN1_RECUR);
        return ret;
 }
 
 /* 
    testing of change notify mask change
 */
-static bool test_notify_mask_change(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+
+#define BASEDIR_CN1_CNMC BASEDIR "_CN1_CNMC"
+
+static bool test_notify_mask_change(struct torture_context *tctx,
+                                   struct smbcli_state *cli)
 {
        bool ret = true;
        NTSTATUS status;
@@ -436,13 +564,16 @@ static bool test_notify_mask_change(struct smbcli_state *cli, TALLOC_CTX *mem_ct
        int fnum;
        struct smbcli_request *req1, *req2;
 
-       printf("TESTING CHANGE NOTIFY WITH MASK CHANGE\n");
+       torture_comment(tctx, "TESTING CHANGE NOTIFY WITH MASK CHANGE\n");
+
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR_CN1_CNMC),
+                      "Failed to setup up test directory: " BASEDIR_CN1_CNMC);
 
        /*
          get a handle on the directory
        */
        io.generic.level = RAW_OPEN_NTCREATEX;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.flags = 0;
        io.ntcreatex.in.access_mask = SEC_FILE_ALL;
        io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
@@ -452,10 +583,11 @@ static bool test_notify_mask_change(struct smbcli_state *cli, TALLOC_CTX *mem_ct
        io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
        io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
        io.ntcreatex.in.security_flags = 0;
-       io.ntcreatex.in.fname = BASEDIR;
+       io.ntcreatex.in.fname = BASEDIR_CN1_CNMC;
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
        fnum = io.ntcreatex.out.file.fnum;
 
        /* ask for a change notify, on file or directory name
@@ -473,27 +605,41 @@ static bool test_notify_mask_change(struct smbcli_state *cli, TALLOC_CTX *mem_ct
 
        /* cancel initial requests so the buffer is setup */
        smb_raw_ntcancel(req1);
-       status = smb_raw_changenotify_recv(req1, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_CANCELLED);
+       status = smb_raw_changenotify_recv(req1, tctx, &notify);
+       torture_assert_ntstatus_equal_goto(tctx, status,
+                                          NT_STATUS_CANCELLED,
+                                          ret, done,
+                                          "smb_raw_changenotify_recv");
 
        smb_raw_ntcancel(req2);
-       status = smb_raw_changenotify_recv(req2, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_CANCELLED);
+       status = smb_raw_changenotify_recv(req2, tctx, &notify);
+       torture_assert_ntstatus_equal_goto(tctx, status,
+                                          NT_STATUS_CANCELLED,
+                                          ret, done,
+                                          "smb_raw_changenotify_recv");
 
        notify.nttrans.in.recursive = true;
        req1 = smb_raw_changenotify_send(cli->tree, &notify);
 
        /* Set to hidden then back again. */
-       smbcli_close(cli->tree, smbcli_open(cli->tree, BASEDIR "\\tname1", O_CREAT, 0));
-       smbcli_setatr(cli->tree, BASEDIR "\\tname1", FILE_ATTRIBUTE_HIDDEN, 0);
-       smbcli_unlink(cli->tree, BASEDIR "\\tname1");
-
-       status = smb_raw_changenotify_recv(req1, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-
-       CHECK_VAL(notify.nttrans.out.num_changes, 1);
-       CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_MODIFIED);
-       CHECK_WSTR(notify.nttrans.out.changes[0].name, "tname1", STR_UNICODE);
+       smbcli_close(cli->tree,
+               smbcli_open(cli->tree,BASEDIR_CN1_CNMC "\\tname1", O_CREAT, 0));
+       smbcli_setatr(cli->tree, BASEDIR_CN1_CNMC "\\tname1",
+               FILE_ATTRIBUTE_HIDDEN, 0);
+       smbcli_unlink(cli->tree, BASEDIR_CN1_CNMC "\\tname1");
+
+       status = smb_raw_changenotify_recv(req1, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_MODIFIED, ret, done,
+                                     "wrong action (exp: MODIFIED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "tname1",
+                  STR_UNICODE);
 
        /* Now try and change the mask to include other events.
         * This should not work - once the mask is set on a directory
@@ -506,38 +652,55 @@ static bool test_notify_mask_change(struct smbcli_state *cli, TALLOC_CTX *mem_ct
        notify.nttrans.in.recursive = false;
        req2 = smb_raw_changenotify_send(cli->tree, &notify);
 
-       smbcli_mkdir(cli->tree, BASEDIR "\\subdir-name");
-       smbcli_mkdir(cli->tree, BASEDIR "\\subdir-name\\subname1");
+       smbcli_mkdir(cli->tree, BASEDIR_CN1_CNMC "\\subdir-name");
+       smbcli_mkdir(cli->tree, BASEDIR_CN1_CNMC "\\subdir-name\\subname1");
        smbcli_close(cli->tree, 
-                    smbcli_open(cli->tree, BASEDIR "\\subdir-name\\subname2", O_CREAT, 0));
-       smbcli_rename(cli->tree, BASEDIR "\\subdir-name\\subname1", BASEDIR "\\subdir-name\\subname1-r");
-       smbcli_rename(cli->tree, BASEDIR "\\subdir-name\\subname2", BASEDIR "\\subname2-r");
-       smbcli_rename(cli->tree, BASEDIR "\\subname2-r", BASEDIR "\\subname3-r");
-
-       smbcli_rmdir(cli->tree, BASEDIR "\\subdir-name\\subname1-r");
-       smbcli_rmdir(cli->tree, BASEDIR "\\subdir-name");
-       smbcli_unlink(cli->tree, BASEDIR "\\subname3-r");
-
-       status = smb_raw_changenotify_recv(req1, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-
-       CHECK_VAL(notify.nttrans.out.num_changes, 1);
-       CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_MODIFIED);
-       CHECK_WSTR(notify.nttrans.out.changes[0].name, "subname2-r", STR_UNICODE);
-
-       status = smb_raw_changenotify_recv(req2, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-
-       CHECK_VAL(notify.nttrans.out.num_changes, 1);
-       CHECK_VAL(notify.nttrans.out.changes[0].action, NOTIFY_ACTION_MODIFIED);
-       CHECK_WSTR(notify.nttrans.out.changes[0].name, "subname3-r", STR_UNICODE);
-
-       if (!ret) {
-               goto done;
-       }
+                    smbcli_open(cli->tree,
+                       BASEDIR_CN1_CNMC "\\subdir-name\\subname2",
+                       O_CREAT, 0));
+       smbcli_rename(cli->tree,
+                       BASEDIR_CN1_CNMC "\\subdir-name\\subname1",
+                       BASEDIR_CN1_CNMC "\\subdir-name\\subname1-r");
+       smbcli_rename(cli->tree,
+                       BASEDIR_CN1_CNMC "\\subdir-name\\subname2",
+                       BASEDIR_CN1_CNMC "\\subname2-r");
+       smbcli_rename(cli->tree,
+                       BASEDIR_CN1_CNMC "\\subname2-r",
+                       BASEDIR_CN1_CNMC "\\subname3-r");
+
+       smbcli_rmdir(cli->tree, BASEDIR_CN1_CNMC "\\subdir-name\\subname1-r");
+       smbcli_rmdir(cli->tree, BASEDIR_CN1_CNMC "\\subdir-name");
+       smbcli_unlink(cli->tree, BASEDIR_CN1_CNMC "\\subname3-r");
+
+       status = smb_raw_changenotify_recv(req1, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_MODIFIED, ret, done,
+                                     "wrong action (exp: MODIFIED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subname2-r",
+                  STR_UNICODE);
+
+       status = smb_raw_changenotify_recv(req2, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_MODIFIED, ret, done,
+                                     "wrong action (exp: MODIFIED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subname3-r",
+                  STR_UNICODE);
 
 done:
        smb_raw_exit(cli->session);
+       smbcli_deltree(cli->tree, BASEDIR_CN1_CNMC);
        return ret;
 }
 
@@ -545,12 +708,18 @@ done:
 /* 
    testing of mask bits for change notify
 */
-static bool test_notify_mask(struct smbcli_state *cli, struct torture_context *tctx)
+
+#define BASEDIR_CN1_NOTM BASEDIR "_CN1_NOTM"
+
+static bool test_notify_mask(struct torture_context *tctx,
+                            struct smbcli_state *cli,
+                            struct smbcli_state *cli2)
 {
        bool ret = true;
        NTSTATUS status;
        union smb_notify notify;
        union smb_open io;
+       union smb_chkpath chkpath;
        int fnum, fnum2;
        uint32_t mask;
        int i;
@@ -558,16 +727,19 @@ static bool test_notify_mask(struct smbcli_state *cli, struct torture_context *t
        struct timeval tv;
        NTTIME t;
 
-       printf("TESTING CHANGE NOTIFY COMPLETION FILTERS\n");
+       torture_comment(tctx, "TESTING CHANGE NOTIFY COMPLETION FILTERS\n");
+
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR_CN1_NOTM),
+                      "Failed to setup up test directory: " BASEDIR_CN1_NOTM);
 
        tv = timeval_current_ofs(1000, 0);
        t = timeval_to_nttime(&tv);
-               
+
        /*
          get a handle on the directory
        */
        io.generic.level = RAW_OPEN_NTCREATEX;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.flags = 0;
        io.ntcreatex.in.access_mask = SEC_FILE_ALL;
        io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
@@ -577,210 +749,259 @@ static bool test_notify_mask(struct smbcli_state *cli, struct torture_context *t
        io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
        io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
        io.ntcreatex.in.security_flags = 0;
-       io.ntcreatex.in.fname = BASEDIR;
+       io.ntcreatex.in.fname = BASEDIR_CN1_NOTM;
 
        notify.nttrans.level = RAW_NOTIFY_NTTRANS;
        notify.nttrans.in.buffer_size = 1000;
        notify.nttrans.in.recursive = true;
 
+       chkpath.chkpath.in.path = "\\";
+
 #define NOTIFY_MASK_TEST(test_name, setup, op, cleanup, Action, expected, nchanges) \
        do { \
        smbcli_getatr(cli->tree, test_name, NULL, NULL, NULL); \
-       do { for (mask=i=0;i<32;i++) { \
+       for (mask=i=0;i<32;i++) { \
                struct smbcli_request *req; \
                status = smb_raw_open(cli->tree, tctx, &io); \
-               CHECK_STATUS(status, NT_STATUS_OK); \
+               torture_assert_ntstatus_ok_goto(tctx, status, ret, done, \
+                                               "smb_raw_open"); \
                fnum = io.ntcreatex.out.file.fnum; \
                setup \
                notify.nttrans.in.file.fnum = fnum;     \
                notify.nttrans.in.completion_filter = (1<<i); \
                req = smb_raw_changenotify_send(cli->tree, &notify); \
+               smb_raw_chkpath(cli->tree, &chkpath); \
                op \
-               msleep(200); smb_raw_ntcancel(req); \
+               smb_msleep(200); smb_raw_ntcancel(req); \
                status = smb_raw_changenotify_recv(req, tctx, &notify); \
                cleanup \
                smbcli_close(cli->tree, fnum); \
                if (NT_STATUS_EQUAL(status, NT_STATUS_CANCELLED)) continue; \
-               CHECK_STATUS(status, NT_STATUS_OK); \
+               torture_assert_ntstatus_ok_goto(tctx, status, ret, done, \
+                                               "smbcli_close"); \
                /* special case to cope with file rename behaviour */ \
                if (nchanges == 2 && notify.nttrans.out.num_changes == 1 && \
                    notify.nttrans.out.changes[0].action == NOTIFY_ACTION_MODIFIED && \
                    ((expected) & FILE_NOTIFY_CHANGE_ATTRIBUTES) && \
                    Action == NOTIFY_ACTION_OLD_NAME) { \
-                       printf("(rename file special handling OK)\n"); \
-               } else if (nchanges != notify.nttrans.out.num_changes) { \
-                       printf("ERROR: nchanges=%d expected=%d action=%d filter=0x%08x\n", \
-                              notify.nttrans.out.num_changes, \
-                              nchanges, \
-                              notify.nttrans.out.changes[0].action, \
-                              notify.nttrans.in.completion_filter); \
-                       ret = false; \
-               } else if (notify.nttrans.out.changes[0].action != Action) { \
-                       printf("ERROR: nchanges=%d action=%d expectedAction=%d filter=0x%08x\n", \
-                              notify.nttrans.out.num_changes, \
-                              notify.nttrans.out.changes[0].action, \
-                              Action, \
-                              notify.nttrans.in.completion_filter); \
-                       ret = false; \
-               } else if (strcmp(notify.nttrans.out.changes[0].name.s, "tname1") != 0) { \
-                       printf("ERROR: nchanges=%d action=%d filter=0x%08x name=%s\n", \
-                              notify.nttrans.out.num_changes, \
-                              notify.nttrans.out.changes[0].action, \
-                              notify.nttrans.in.completion_filter, \
-                              notify.nttrans.out.changes[0].name.s);   \
-                       ret = false; \
+                       torture_comment(tctx, "(rename file special handling OK)\n"); \
+               } else { \
+                       torture_assert_int_equal_goto(tctx, \
+                               notify.nttrans.out.num_changes,\
+                               nchanges, ret, done, \
+                               talloc_asprintf(tctx, \
+                                       "nchanges=%d expected=%d action=%d " \
+                                       "filter=0x%08x\n", \
+                                       notify.nttrans.out.num_changes, \
+                                       nchanges, \
+                                       notify.nttrans.out.changes[0].action, \
+                                       notify.nttrans.in.completion_filter)); \
+                       torture_assert_int_equal_goto(tctx, \
+                               notify.nttrans.out.changes[0].action, \
+                               Action, ret, done, \
+                               talloc_asprintf(tctx, \
+                                       "nchanges=%d action=%d " \
+                                       "expectedAction=%d filter=0x%08x\n", \
+                                       notify.nttrans.out.num_changes, \
+                                       notify.nttrans.out.changes[0].action, \
+                                       Action, \
+                                       notify.nttrans.in.completion_filter)); \
+                       torture_assert_str_equal_goto(tctx, \
+                               notify.nttrans.out.changes[0].name.s, \
+                               "tname1", ret, done, \
+                               talloc_asprintf(tctx, \
+                                       "nchanges=%d action=%d filter=0x%08x " \
+                                       "name=%s expected_name=tname1\n", \
+                                       notify.nttrans.out.num_changes, \
+                                       notify.nttrans.out.changes[0].action, \
+                                       notify.nttrans.in.completion_filter, \
+                                       notify.nttrans.out.changes[0].name.s));\
                } \
                mask |= (1<<i); \
        } \
        if ((expected) != mask) { \
-               if (((expected) & ~mask) != 0) { \
-                       printf("ERROR: trigger on too few bits. mask=0x%08x expected=0x%08x\n", \
-                              mask, expected); \
-                       ret = false; \
-               } else { \
-                       printf("WARNING: trigger on too many bits. mask=0x%08x expected=0x%08x\n", \
-                              mask, expected); \
-               } \
+               torture_assert_int_not_equal_goto(tctx, ((expected) & ~mask), \
+                               0, ret, done, "Too few bits"); \
+               torture_comment(tctx, "WARNING: trigger on too many bits. mask=0x%08x expected=0x%08x\n", \
+                      mask, expected); \
        } \
-       } while (0); \
        } while (0);
 
-       printf("testing mkdir\n");
-       NOTIFY_MASK_TEST("testing mkdir",;,
-                        smbcli_mkdir(cli->tree, BASEDIR "\\tname1");,
-                        smbcli_rmdir(cli->tree, BASEDIR "\\tname1");,
+       torture_comment(tctx, "Testing mkdir\n");
+       NOTIFY_MASK_TEST("Testing mkdir",;,
+                        smbcli_mkdir(cli->tree, BASEDIR_CN1_NOTM "\\tname1");,
+                        smbcli_rmdir(cli2->tree, BASEDIR_CN1_NOTM "\\tname1");,
                         NOTIFY_ACTION_ADDED,
                         FILE_NOTIFY_CHANGE_DIR_NAME, 1);
 
-       printf("testing create file\n");
-       NOTIFY_MASK_TEST("testing create file",;,
-                        smbcli_close(cli->tree, smbcli_open(cli->tree, BASEDIR "\\tname1", O_CREAT, 0));,
-                        smbcli_unlink(cli->tree, BASEDIR "\\tname1");,
+       torture_comment(tctx, "Testing create file\n");
+       NOTIFY_MASK_TEST("Testing create file",;,
+                        smbcli_close(cli->tree,
+                               smbcli_open(cli->tree,
+                                       BASEDIR_CN1_NOTM "\\tname1",
+                                       O_CREAT, 0));,
+                        smbcli_unlink(cli2->tree,
+                               BASEDIR_CN1_NOTM "\\tname1");,
                         NOTIFY_ACTION_ADDED,
                         FILE_NOTIFY_CHANGE_FILE_NAME, 1);
 
-       printf("testing unlink\n");
-       NOTIFY_MASK_TEST("testing unlink",
-                        smbcli_close(cli->tree, smbcli_open(cli->tree, BASEDIR "\\tname1", O_CREAT, 0));,
-                        smbcli_unlink(cli->tree, BASEDIR "\\tname1");,
+       torture_comment(tctx, "Testing unlink\n");
+       NOTIFY_MASK_TEST("Testing unlink",
+                        smbcli_close(cli->tree,
+                               smbcli_open(cli->tree,
+                                       BASEDIR_CN1_NOTM "\\tname1",
+                                       O_CREAT, 0));,
+                        smbcli_unlink(cli2->tree,
+                               BASEDIR_CN1_NOTM "\\tname1");,
                         ;,
                         NOTIFY_ACTION_REMOVED,
                         FILE_NOTIFY_CHANGE_FILE_NAME, 1);
 
-       printf("testing rmdir\n");
-       NOTIFY_MASK_TEST("testing rmdir",
-                        smbcli_mkdir(cli->tree, BASEDIR "\\tname1");,
-                        smbcli_rmdir(cli->tree, BASEDIR "\\tname1");,
+       torture_comment(tctx, "Testing rmdir\n");
+       NOTIFY_MASK_TEST("Testing rmdir",
+                        smbcli_mkdir(cli->tree, BASEDIR_CN1_NOTM "\\tname1");,
+                        smbcli_rmdir(cli2->tree, BASEDIR_CN1_NOTM "\\tname1");,
                         ;,
                         NOTIFY_ACTION_REMOVED,
                         FILE_NOTIFY_CHANGE_DIR_NAME, 1);
 
-       printf("testing rename file\n");
-       NOTIFY_MASK_TEST("testing rename file",
-                        smbcli_close(cli->tree, smbcli_open(cli->tree, BASEDIR "\\tname1", O_CREAT, 0));,
-                        smbcli_rename(cli->tree, BASEDIR "\\tname1", BASEDIR "\\tname2");,
-                        smbcli_unlink(cli->tree, BASEDIR "\\tname2");,
+       torture_comment(tctx, "Testing rename file\n");
+       NOTIFY_MASK_TEST("Testing rename file",
+                        smbcli_close(cli->tree,
+                               smbcli_open(cli->tree,
+                                       BASEDIR_CN1_NOTM "\\tname1",
+                                       O_CREAT, 0));,
+                        smbcli_rename(cli2->tree,
+                               BASEDIR_CN1_NOTM "\\tname1",
+                               BASEDIR_CN1_NOTM "\\tname2");,
+                        smbcli_unlink(cli->tree, BASEDIR_CN1_NOTM "\\tname2");,
                         NOTIFY_ACTION_OLD_NAME,
                         FILE_NOTIFY_CHANGE_FILE_NAME|FILE_NOTIFY_CHANGE_ATTRIBUTES|FILE_NOTIFY_CHANGE_CREATION, 2);
 
-       printf("testing rename dir\n");
-       NOTIFY_MASK_TEST("testing rename dir",
-               smbcli_mkdir(cli->tree, BASEDIR "\\tname1");,
-               smbcli_rename(cli->tree, BASEDIR "\\tname1", BASEDIR "\\tname2");,
-               smbcli_rmdir(cli->tree, BASEDIR "\\tname2");,
+       torture_comment(tctx, "Testing rename dir\n");
+       NOTIFY_MASK_TEST("Testing rename dir",
+               smbcli_mkdir(cli->tree, BASEDIR_CN1_NOTM "\\tname1");,
+               smbcli_rename(cli2->tree,
+                       BASEDIR_CN1_NOTM "\\tname1",
+                       BASEDIR_CN1_NOTM "\\tname2");,
+               smbcli_rmdir(cli->tree, BASEDIR_CN1_NOTM "\\tname2");,
                NOTIFY_ACTION_OLD_NAME,
                FILE_NOTIFY_CHANGE_DIR_NAME, 2);
 
-       printf("testing set path attribute\n");
-       NOTIFY_MASK_TEST("testing set path attribute",
-               smbcli_close(cli->tree, smbcli_open(cli->tree, BASEDIR "\\tname1", O_CREAT, 0));,
-               smbcli_setatr(cli->tree, BASEDIR "\\tname1", FILE_ATTRIBUTE_HIDDEN, 0);,
-               smbcli_unlink(cli->tree, BASEDIR "\\tname1");,
+       torture_comment(tctx, "Testing set path attribute\n");
+       NOTIFY_MASK_TEST("Testing set path attribute",
+               smbcli_close(cli->tree,
+                       smbcli_open(cli->tree,
+                               BASEDIR_CN1_NOTM "\\tname1", O_CREAT, 0));,
+               smbcli_setatr(cli2->tree,
+                       BASEDIR_CN1_NOTM "\\tname1", FILE_ATTRIBUTE_HIDDEN, 0);,
+               smbcli_unlink(cli->tree, BASEDIR_CN1_NOTM "\\tname1");,
                NOTIFY_ACTION_MODIFIED,
                FILE_NOTIFY_CHANGE_ATTRIBUTES, 1);
 
-       printf("testing set path write time\n");
-       NOTIFY_MASK_TEST("testing set path write time",
-               smbcli_close(cli->tree, smbcli_open(cli->tree, BASEDIR "\\tname1", O_CREAT, 0));,
-               smbcli_setatr(cli->tree, BASEDIR "\\tname1", FILE_ATTRIBUTE_NORMAL, 1000);,
-               smbcli_unlink(cli->tree, BASEDIR "\\tname1");,
+       torture_comment(tctx, "Testing set path write time\n");
+       NOTIFY_MASK_TEST("Testing set path write time",
+               smbcli_close(cli->tree, smbcli_open(cli->tree,
+                       BASEDIR_CN1_NOTM "\\tname1", O_CREAT, 0));,
+               smbcli_setatr(cli2->tree,
+                       BASEDIR_CN1_NOTM "\\tname1",
+                       FILE_ATTRIBUTE_NORMAL, 1000);,
+               smbcli_unlink(cli->tree, BASEDIR_CN1_NOTM "\\tname1");,
                NOTIFY_ACTION_MODIFIED,
                FILE_NOTIFY_CHANGE_LAST_WRITE, 1);
 
-       printf("testing set file attribute\n");
-       NOTIFY_MASK_TEST("testing set file attribute",
-               fnum2 = create_complex_file(cli, tctx, BASEDIR "\\tname1");,
-               smbcli_fsetatr(cli->tree, fnum2, FILE_ATTRIBUTE_HIDDEN, 0, 0, 0, 0);,
-               (smbcli_close(cli->tree, fnum2), smbcli_unlink(cli->tree, BASEDIR "\\tname1"));,
+       torture_comment(tctx, "Testing set file attribute\n");
+       NOTIFY_MASK_TEST("Testing set file attribute",
+               fnum2 = create_complex_file(cli2, tctx,
+                       BASEDIR_CN1_NOTM "\\tname1");,
+               smbcli_fsetatr(cli2->tree, fnum2, FILE_ATTRIBUTE_HIDDEN, 0, 0, 0, 0);,
+               (smbcli_close(cli2->tree, fnum2),
+               smbcli_unlink(cli2->tree, BASEDIR_CN1_NOTM "\\tname1"));,
                NOTIFY_ACTION_MODIFIED,
                FILE_NOTIFY_CHANGE_ATTRIBUTES, 1);
 
        if (torture_setting_bool(tctx, "samba3", false)) {
-               printf("Samba3 does not yet support create times "
+               torture_comment(tctx, "Samba3 does not yet support create times "
                       "everywhere\n");
        }
        else {
-               printf("testing set file create time\n");
-               NOTIFY_MASK_TEST("testing set file create time",
+               torture_comment(tctx, "Testing set file create time\n");
+               NOTIFY_MASK_TEST("Testing set file create time",
                        fnum2 = create_complex_file(cli, tctx,
-                                                   BASEDIR "\\tname1");,
+                                           BASEDIR_CN1_NOTM "\\tname1");,
                        smbcli_fsetatr(cli->tree, fnum2, 0, t, 0, 0, 0);,
                        (smbcli_close(cli->tree, fnum2),
-                        smbcli_unlink(cli->tree, BASEDIR "\\tname1"));,
+                        smbcli_unlink(cli->tree,
+                                       BASEDIR_CN1_NOTM "\\tname1"));,
                        NOTIFY_ACTION_MODIFIED,
                        FILE_NOTIFY_CHANGE_CREATION, 1);
        }
 
-       printf("testing set file access time\n");
-       NOTIFY_MASK_TEST("testing set file access time",
-               fnum2 = create_complex_file(cli, tctx, BASEDIR "\\tname1");,
+       torture_comment(tctx, "Testing set file access time\n");
+       NOTIFY_MASK_TEST("Testing set file access time",
+               fnum2 = create_complex_file(cli, tctx,
+                               BASEDIR_CN1_NOTM "\\tname1");,
                smbcli_fsetatr(cli->tree, fnum2, 0, 0, t, 0, 0);,
-               (smbcli_close(cli->tree, fnum2), smbcli_unlink(cli->tree, BASEDIR "\\tname1"));,
+               (smbcli_close(cli->tree, fnum2),
+                       smbcli_unlink(cli->tree, BASEDIR_CN1_NOTM "\\tname1"));,
                NOTIFY_ACTION_MODIFIED,
                FILE_NOTIFY_CHANGE_LAST_ACCESS, 1);
 
-       printf("testing set file write time\n");
-       NOTIFY_MASK_TEST("testing set file write time",
-               fnum2 = create_complex_file(cli, tctx, BASEDIR "\\tname1");,
+       torture_comment(tctx, "Testing set file write time\n");
+       NOTIFY_MASK_TEST("Testing set file write time",
+               fnum2 = create_complex_file(cli, tctx,
+                       BASEDIR_CN1_NOTM "\\tname1");,
                smbcli_fsetatr(cli->tree, fnum2, 0, 0, 0, t, 0);,
-               (smbcli_close(cli->tree, fnum2), smbcli_unlink(cli->tree, BASEDIR "\\tname1"));,
+               (smbcli_close(cli->tree, fnum2),
+               smbcli_unlink(cli->tree, BASEDIR_CN1_NOTM "\\tname1"));,
                NOTIFY_ACTION_MODIFIED,
                FILE_NOTIFY_CHANGE_LAST_WRITE, 1);
 
-       printf("testing set file change time\n");
-       NOTIFY_MASK_TEST("testing set file change time",
-               fnum2 = create_complex_file(cli, tctx, BASEDIR "\\tname1");,
+       torture_comment(tctx, "Testing set file change time\n");
+       NOTIFY_MASK_TEST("Testing set file change time",
+               fnum2 = create_complex_file(cli, tctx,
+                       BASEDIR_CN1_NOTM "\\tname1");,
                smbcli_fsetatr(cli->tree, fnum2, 0, 0, 0, 0, t);,
-               (smbcli_close(cli->tree, fnum2), smbcli_unlink(cli->tree, BASEDIR "\\tname1"));,
+               (smbcli_close(cli->tree, fnum2),
+               smbcli_unlink(cli->tree, BASEDIR_CN1_NOTM "\\tname1"));,
                NOTIFY_ACTION_MODIFIED,
                0, 1);
 
 
-       printf("testing write\n");
-       NOTIFY_MASK_TEST("testing write",
-               fnum2 = create_complex_file(cli, tctx, BASEDIR "\\tname1");,
-               smbcli_write(cli->tree, fnum2, 1, &c, 10000, 1);,
-               (smbcli_close(cli->tree, fnum2), smbcli_unlink(cli->tree, BASEDIR "\\tname1"));,
+       torture_comment(tctx, "Testing write\n");
+       NOTIFY_MASK_TEST("Testing write",
+               fnum2 = create_complex_file(cli2, tctx,
+                       BASEDIR_CN1_NOTM "\\tname1");,
+               smbcli_write(cli2->tree, fnum2, 1, &c, 10000, 1);,
+               (smbcli_close(cli2->tree, fnum2),
+                       smbcli_unlink(cli->tree, BASEDIR_CN1_NOTM "\\tname1"));,
                NOTIFY_ACTION_MODIFIED,
                0, 1);
 
-       printf("testing truncate\n");
-       NOTIFY_MASK_TEST("testing truncate",
-               fnum2 = create_complex_file(cli, tctx, BASEDIR "\\tname1");,
-               smbcli_ftruncate(cli->tree, fnum2, 10000);,
-               (smbcli_close(cli->tree, fnum2), smbcli_unlink(cli->tree, BASEDIR "\\tname1"));,
+       torture_comment(tctx, "Testing truncate\n");
+       NOTIFY_MASK_TEST("Testing truncate",
+               fnum2 = create_complex_file(cli2, tctx,
+                       BASEDIR_CN1_NOTM "\\tname1");,
+               smbcli_ftruncate(cli2->tree, fnum2, 10000);,
+               (smbcli_close(cli2->tree, fnum2),
+               smbcli_unlink(cli2->tree, BASEDIR_CN1_NOTM "\\tname1"));,
                NOTIFY_ACTION_MODIFIED,
                FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_ATTRIBUTES, 1);
 
 done:
        smb_raw_exit(cli->session);
+       smbcli_deltree(cli->tree, BASEDIR_CN1_NOTM);
        return ret;
 }
 
 /*
   basic testing of change notify on files
 */
-static bool test_notify_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+
+#define BASEDIR_CN1_FILE BASEDIR "_CN1_FILE"
+
+static bool test_notify_file(struct torture_context *tctx,
+                            struct smbcli_state *cli)
 {
        NTSTATUS status;
        bool ret = true;
@@ -789,12 +1010,15 @@ static bool test_notify_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        union smb_notify notify;
        struct smbcli_request *req;
        int fnum;
-       const char *fname = BASEDIR "\\file.txt";
+       const char *fname = BASEDIR_CN1_FILE "\\file.txt";
 
-       printf("TESTING CHANGE NOTIFY ON FILES\n");
+       torture_comment(tctx, "TESTING CHANGE NOTIFY ON FILES\n");
+
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR_CN1_FILE),
+                      "Failed to setup up test directory: " BASEDIR_CN1_FILE);
 
        io.generic.level = RAW_OPEN_NTCREATEX;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.flags = 0;
        io.ntcreatex.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
        io.ntcreatex.in.create_options = 0;
@@ -805,8 +1029,9 @@ static bool test_notify_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
        io.ntcreatex.in.security_flags = 0;
        io.ntcreatex.in.fname = fname;
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
        fnum = io.ntcreatex.out.file.fnum;
 
        /* ask for a change notify,
@@ -817,30 +1042,39 @@ static bool test_notify_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        notify.nttrans.in.completion_filter = FILE_NOTIFY_CHANGE_STREAM_NAME;
        notify.nttrans.in.recursive = false;
 
-       printf("testing if notifies on file handles are invalid (should be)\n");
+       torture_comment(tctx, "Testing if notifies on file handles are invalid (should be)\n");
 
        req = smb_raw_changenotify_send(cli->tree, &notify);
-       status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_equal_goto(tctx, status,
+                                          NT_STATUS_INVALID_PARAMETER,
+                                          ret, done,
+                                          "smb_raw_changenotify_recv");
 
        cl.close.level = RAW_CLOSE_CLOSE;
        cl.close.in.file.fnum = fnum;
        cl.close.in.write_time = 0;
        status = smb_raw_close(cli->tree, &cl);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_close");
 
        status = smbcli_unlink(cli->tree, fname);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smbcli_unlink");
 
 done:
        smb_raw_exit(cli->session);
+       smbcli_deltree(cli->tree, BASEDIR_CN1_FILE);
        return ret;
 }
 
 /*
   basic testing of change notifies followed by a tdis
 */
-static bool test_notify_tdis(struct torture_context *tctx)
+#define BASEDIR_CN1_TDIS BASEDIR "_CN1_TDIS"
+
+static bool test_notify_tdis(struct torture_context *tctx,
+                            struct smbcli_state *cli1)
 {
        bool ret = true;
        NTSTATUS status;
@@ -850,17 +1084,19 @@ static bool test_notify_tdis(struct torture_context *tctx)
        struct smbcli_request *req;
        struct smbcli_state *cli = NULL;
 
-       printf("TESTING CHANGE NOTIFY FOLLOWED BY TDIS\n");
+       torture_comment(tctx, "TESTING CHANGE NOTIFY FOLLOWED BY TDIS\n");
 
-       if (!torture_open_connection(&cli, tctx, 0)) {
-               return false;
-       }
+       torture_assert(tctx, torture_setup_dir(cli1, BASEDIR_CN1_TDIS),
+                      "Failed to setup up test directory: " BASEDIR_CN1_TDIS);
+
+       torture_assert(tctx, torture_open_connection(&cli, tctx, 0),
+                      "Failed to open connection.");
 
        /*
          get a handle on the directory
        */
        io.generic.level = RAW_OPEN_NTCREATEX;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.flags = 0;
        io.ntcreatex.in.access_mask = SEC_FILE_ALL;
        io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
@@ -870,10 +1106,11 @@ static bool test_notify_tdis(struct torture_context *tctx)
        io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
        io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
        io.ntcreatex.in.security_flags = 0;
-       io.ntcreatex.in.fname = BASEDIR;
+       io.ntcreatex.in.fname = BASEDIR_CN1_TDIS;
 
        status = smb_raw_open(cli->tree, tctx, &io);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
        fnum = io.ntcreatex.out.file.fnum;
 
        /* ask for a change notify,
@@ -887,22 +1124,30 @@ static bool test_notify_tdis(struct torture_context *tctx)
        req = smb_raw_changenotify_send(cli->tree, &notify);
 
        status = smbcli_tdis(cli);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smbcli_tdis");
        cli->tree = NULL;
 
        status = smb_raw_changenotify_recv(req, tctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VAL(notify.nttrans.out.num_changes, 0);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     0, ret, done, "no changes expected");
 
 done:
        torture_close_connection(cli);
+       smbcli_deltree(cli1->tree, BASEDIR_CN1_TDIS);
        return ret;
 }
 
 /*
   basic testing of change notifies followed by a exit
 */
-static bool test_notify_exit(struct torture_context *tctx)
+
+#define BASEDIR_CN1_EX BASEDIR "_CN1_EX"
+
+static bool test_notify_exit(struct torture_context *tctx,
+                            struct smbcli_state *cli1)
 {
        bool ret = true;
        NTSTATUS status;
@@ -912,17 +1157,19 @@ static bool test_notify_exit(struct torture_context *tctx)
        struct smbcli_request *req;
        struct smbcli_state *cli = NULL;
 
-       printf("TESTING CHANGE NOTIFY FOLLOWED BY EXIT\n");
+       torture_comment(tctx, "TESTING CHANGE NOTIFY FOLLOWED BY EXIT\n");
 
-       if (!torture_open_connection(&cli, tctx, 0)) {
-               return false;
-       }
+       torture_assert(tctx, torture_setup_dir(cli1, BASEDIR_CN1_EX),
+                      "Failed to setup up test directory: " BASEDIR_CN1_EX);
+
+       torture_assert(tctx, torture_open_connection(&cli, tctx, 0),
+                      "Failed to open connection.");
 
        /*
          get a handle on the directory
        */
        io.generic.level = RAW_OPEN_NTCREATEX;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.flags = 0;
        io.ntcreatex.in.access_mask = SEC_FILE_ALL;
        io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
@@ -932,10 +1179,11 @@ static bool test_notify_exit(struct torture_context *tctx)
        io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
        io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
        io.ntcreatex.in.security_flags = 0;
-       io.ntcreatex.in.fname = BASEDIR;
+       io.ntcreatex.in.fname = BASEDIR_CN1_EX;
 
        status = smb_raw_open(cli->tree, tctx, &io);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
        fnum = io.ntcreatex.out.file.fnum;
 
        /* ask for a change notify,
@@ -949,21 +1197,29 @@ static bool test_notify_exit(struct torture_context *tctx)
        req = smb_raw_changenotify_send(cli->tree, &notify);
 
        status = smb_raw_exit(cli->session);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_exit");
 
        status = smb_raw_changenotify_recv(req, tctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VAL(notify.nttrans.out.num_changes, 0);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     0, ret, done, "no changes expected");
 
 done:
        torture_close_connection(cli);
+       smbcli_deltree(cli1->tree, BASEDIR_CN1_EX);
        return ret;
 }
 
 /*
   basic testing of change notifies followed by a ulogoff
 */
-static bool test_notify_ulogoff(struct torture_context *tctx)
+
+#define BASEDIR_CN1_UL BASEDIR "_CN1_UL"
+
+static bool test_notify_ulogoff(struct torture_context *tctx,
+                               struct smbcli_state *cli1)
 {
        bool ret = true;
        NTSTATUS status;
@@ -973,17 +1229,19 @@ static bool test_notify_ulogoff(struct torture_context *tctx)
        struct smbcli_request *req;
        struct smbcli_state *cli = NULL;
 
-       printf("TESTING CHANGE NOTIFY FOLLOWED BY ULOGOFF\n");
+       torture_comment(tctx, "TESTING CHANGE NOTIFY FOLLOWED BY ULOGOFF\n");
 
-       if (!torture_open_connection(&cli, tctx, 0)) {
-               return false;
-       }
+       torture_assert(tctx, torture_setup_dir(cli1, BASEDIR_CN1_UL),
+                      "Failed to setup up test directory: " BASEDIR_CN1_UL);
+
+       torture_assert(tctx, torture_open_connection(&cli, tctx, 0),
+                      "Failed to open connection.");
 
        /*
          get a handle on the directory
        */
        io.generic.level = RAW_OPEN_NTCREATEX;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.flags = 0;
        io.ntcreatex.in.access_mask = SEC_FILE_ALL;
        io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
@@ -993,10 +1251,11 @@ static bool test_notify_ulogoff(struct torture_context *tctx)
        io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
        io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
        io.ntcreatex.in.security_flags = 0;
-       io.ntcreatex.in.fname = BASEDIR;
+       io.ntcreatex.in.fname = BASEDIR_CN1_UL;
 
        status = smb_raw_open(cli->tree, tctx, &io);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
        fnum = io.ntcreatex.out.file.fnum;
 
        /* ask for a change notify,
@@ -1010,14 +1269,18 @@ static bool test_notify_ulogoff(struct torture_context *tctx)
        req = smb_raw_changenotify_send(cli->tree, &notify);
 
        status = smb_raw_ulogoff(cli->session);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_ulogoff");
 
        status = smb_raw_changenotify_recv(req, tctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VAL(notify.nttrans.out.num_changes, 0);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     0, ret, done, "no changes expected");
 
 done:
        torture_close_connection(cli);
+       smbcli_deltree(cli1->tree, BASEDIR_CN1_UL);
        return ret;
 }
 
@@ -1031,7 +1294,11 @@ static void tcp_dis_handler(struct smbcli_transport *t, void *p)
 /*
   basic testing of change notifies followed by tcp disconnect
 */
-static bool test_notify_tcp_dis(struct torture_context *tctx)
+
+#define BASEDIR_CN1_TCPDIS BASEDIR "_CN1_TCPDIS"
+
+static bool test_notify_tcp_dis(struct torture_context *tctx,
+                               struct smbcli_state *cli1)
 {
        bool ret = true;
        NTSTATUS status;
@@ -1041,17 +1308,20 @@ static bool test_notify_tcp_dis(struct torture_context *tctx)
        struct smbcli_request *req;
        struct smbcli_state *cli = NULL;
 
-       printf("TESTING CHANGE NOTIFY FOLLOWED BY TCP DISCONNECT\n");
+       torture_comment(tctx, "TESTING CHANGE NOTIFY FOLLOWED BY TCP DISCONNECT\n");
 
-       if (!torture_open_connection(&cli, tctx, 0)) {
-               return false;
-       }
+       torture_assert(tctx, torture_setup_dir(cli1, BASEDIR_CN1_TCPDIS),
+                      "Failed to setup up test directory: "
+                       BASEDIR_CN1_TCPDIS);
+
+       torture_assert(tctx, torture_open_connection(&cli, tctx, 0),
+                      "Failed to open connection.");
 
        /*
          get a handle on the directory
        */
        io.generic.level = RAW_OPEN_NTCREATEX;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.flags = 0;
        io.ntcreatex.in.access_mask = SEC_FILE_ALL;
        io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
@@ -1061,10 +1331,11 @@ static bool test_notify_tcp_dis(struct torture_context *tctx)
        io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
        io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
        io.ntcreatex.in.security_flags = 0;
-       io.ntcreatex.in.fname = BASEDIR;
+       io.ntcreatex.in.fname = BASEDIR_CN1_TCPDIS;
 
        status = smb_raw_open(cli->tree, tctx, &io);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
        fnum = io.ntcreatex.out.file.fnum;
 
        /* ask for a change notify,
@@ -1080,17 +1351,25 @@ static bool test_notify_tcp_dis(struct torture_context *tctx)
        smbcli_transport_idle_handler(cli->transport, tcp_dis_handler, 250, cli);
 
        status = smb_raw_changenotify_recv(req, tctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_LOCAL_DISCONNECT);
+       torture_assert_ntstatus_equal_goto(tctx, status,
+                                          NT_STATUS_LOCAL_DISCONNECT,
+                                          ret, done,
+                                          "smb_raw_changenotify_recv");
 
 done:
        torture_close_connection(cli);
+       smbcli_deltree(cli1->tree, BASEDIR_CN1_TCPDIS);
        return ret;
 }
 
 /* 
    test setting up two change notify requests on one handle
 */
-static bool test_notify_double(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+
+#define BASEDIR_CN1_DBL BASEDIR "_CN1_DBL"
+
+static bool test_notify_double(struct torture_context *tctx,
+                              struct smbcli_state *cli)
 {
        bool ret = true;
        NTSTATUS status;
@@ -1099,13 +1378,16 @@ static bool test_notify_double(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        int fnum;
        struct smbcli_request *req1, *req2;
 
-       printf("TESTING CHANGE NOTIFY TWICE ON ONE DIRECTORY\n");
-               
+       torture_comment(tctx, "TESTING CHANGE NOTIFY TWICE ON ONE DIRECTORY\n");
+
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR_CN1_DBL),
+                      "Failed to setup up test directory: " BASEDIR_CN1_DBL);
+
        /*
          get a handle on the directory
        */
        io.generic.level = RAW_OPEN_NTCREATEX;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.flags = 0;
        io.ntcreatex.in.access_mask = SEC_FILE_ALL;
        io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
@@ -1115,10 +1397,11 @@ static bool test_notify_double(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
        io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
        io.ntcreatex.in.security_flags = 0;
-       io.ntcreatex.in.fname = BASEDIR;
+       io.ntcreatex.in.fname = BASEDIR_CN1_DBL;
 
-       status = smb_raw_open(cli->tree, mem_ctx, &io);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
        fnum = io.ntcreatex.out.file.fnum;
 
        /* ask for a change notify,
@@ -1132,22 +1415,29 @@ static bool test_notify_double(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        req1 = smb_raw_changenotify_send(cli->tree, &notify);
        req2 = smb_raw_changenotify_send(cli->tree, &notify);
 
-       smbcli_mkdir(cli->tree, BASEDIR "\\subdir-name");
+       smbcli_mkdir(cli->tree, BASEDIR_CN1_DBL "\\subdir-name");
 
-       status = smb_raw_changenotify_recv(req1, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VAL(notify.nttrans.out.num_changes, 1);
-       CHECK_WSTR(notify.nttrans.out.changes[0].name, "subdir-name", STR_UNICODE);
+       status = smb_raw_changenotify_recv(req1, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of changes");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subdir-name",
+                  STR_UNICODE);
 
-       smbcli_mkdir(cli->tree, BASEDIR "\\subdir-name2");
+       smbcli_mkdir(cli->tree, BASEDIR_CN1_DBL "\\subdir-name2");
 
-       status = smb_raw_changenotify_recv(req2, mem_ctx, &notify);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VAL(notify.nttrans.out.num_changes, 1);
-       CHECK_WSTR(notify.nttrans.out.changes[0].name, "subdir-name2", STR_UNICODE);
+       status = smb_raw_changenotify_recv(req2, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of changes");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subdir-name2",
+                  STR_UNICODE);
 
 done:
        smb_raw_exit(cli->session);
+       smbcli_deltree(cli->tree, BASEDIR_CN1_DBL);
        return ret;
 }
 
@@ -1155,7 +1445,12 @@ done:
 /* 
    test multiple change notifies at different depths and with/without recursion
 */
-static bool test_notify_tree(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+
+#define BASEDIR_CN1_TNT BASEDIR "_CN1_TNT"
+
+static bool test_notify_tree(struct torture_context *tctx,
+                            struct smbcli_state *cli,
+                            struct smbcli_state *cli2)
 {
        bool ret = true;
        union smb_notify notify;
@@ -1170,35 +1465,138 @@ static bool test_notify_tree(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                int fnum;
                int counted;
        } dirs[] = {
-               {BASEDIR "\\abc",               true, FILE_NOTIFY_CHANGE_NAME, 30 },
-               {BASEDIR "\\zqy",               true, FILE_NOTIFY_CHANGE_NAME, 8 },
-               {BASEDIR "\\atsy",              true, FILE_NOTIFY_CHANGE_NAME, 4 },
-               {BASEDIR "\\abc\\foo",          true,  FILE_NOTIFY_CHANGE_NAME, 2 },
-               {BASEDIR "\\abc\\blah",         true,  FILE_NOTIFY_CHANGE_NAME, 13 },
-               {BASEDIR "\\abc\\blah",         false, FILE_NOTIFY_CHANGE_NAME, 7 },
-               {BASEDIR "\\abc\\blah\\a",      true, FILE_NOTIFY_CHANGE_NAME, 2 },
-               {BASEDIR "\\abc\\blah\\b",      true, FILE_NOTIFY_CHANGE_NAME, 2 },
-               {BASEDIR "\\abc\\blah\\c",      true, FILE_NOTIFY_CHANGE_NAME, 2 },
-               {BASEDIR "\\abc\\fooblah",      true, FILE_NOTIFY_CHANGE_NAME, 2 },
-               {BASEDIR "\\zqy\\xx",           true, FILE_NOTIFY_CHANGE_NAME, 2 },
-               {BASEDIR "\\zqy\\yyy",          true, FILE_NOTIFY_CHANGE_NAME, 2 },
-               {BASEDIR "\\zqy\\..",           true, FILE_NOTIFY_CHANGE_NAME, 40 },
-               {BASEDIR,                       true, FILE_NOTIFY_CHANGE_NAME, 40 },
-               {BASEDIR,                       false,FILE_NOTIFY_CHANGE_NAME, 6 },
-               {BASEDIR "\\atsy",              false,FILE_NOTIFY_CHANGE_NAME, 4 },
-               {BASEDIR "\\abc",               true, FILE_NOTIFY_CHANGE_NAME, 24 },
-               {BASEDIR "\\abc",               false,FILE_NOTIFY_CHANGE_FILE_NAME, 0 },
-               {BASEDIR "\\abc",               true, FILE_NOTIFY_CHANGE_FILE_NAME, 0 },
-               {BASEDIR "\\abc",               true, FILE_NOTIFY_CHANGE_NAME, 24 },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\abc",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 30,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\zqy",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 8,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\atsy",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 4,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\abc\\foo",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 2,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\abc\\blah",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 13,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\abc\\blah",
+                       .recursive = false,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 7,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\abc\\blah\\a",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 2,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\abc\\blah\\b",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 2,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\abc\\blah\\c",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 2,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\abc\\fooblah",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 2,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\zqy\\xx",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 2,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\zqy\\yyy",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 2,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\zqy\\..",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 40,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT,
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 40,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT,
+                       .recursive = false,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 6,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\atsy",
+                       .recursive = false,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 4,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\abc",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 24,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\abc",
+                       .recursive = false,
+                       .filter    = FILE_NOTIFY_CHANGE_FILE_NAME,
+                       .expected  = 0,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\abc",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_FILE_NAME,
+                       .expected  = 0,
+               },
+               {
+                       .path      = BASEDIR_CN1_TNT "\\abc",
+                       .recursive = true,
+                       .filter    = FILE_NOTIFY_CHANGE_NAME,
+                       .expected  = 24,
+               },
        };
        int i;
        NTSTATUS status;
        bool all_done = false;
 
-       printf("TESTING CHANGE NOTIFY FOR DIFFERENT DEPTHS\n");
+       torture_comment(tctx, "TESTING CHANGE NOTIFY FOR DIFFERENT DEPTHS\n");
+
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR_CN1_TNT),
+                      "Failed to setup up test directory: " BASEDIR_CN1_TNT);
 
        io.generic.level = RAW_OPEN_NTCREATEX;
-       io.ntcreatex.in.root_fid = 0;
+       io.ntcreatex.in.root_fid.fnum = 0;
        io.ntcreatex.in.flags = 0;
        io.ntcreatex.in.access_mask = SEC_FILE_ALL;
        io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
@@ -1217,8 +1615,9 @@ static bool test_notify_tree(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        */
        for (i=0;i<ARRAY_SIZE(dirs);i++) {
                io.ntcreatex.in.fname = dirs[i].path;
-               status = smb_raw_open(cli->tree, mem_ctx, &io);
-               CHECK_STATUS(status, NT_STATUS_OK);
+               status = smb_raw_open(cli->tree, tctx, &io);
+               torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                               "smb_raw_open");
                dirs[i].fnum = io.ntcreatex.out.file.fnum;
 
                notify.nttrans.in.completion_filter = dirs[i].filter;
@@ -1226,19 +1625,27 @@ static bool test_notify_tree(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                notify.nttrans.in.recursive = dirs[i].recursive;
                req = smb_raw_changenotify_send(cli->tree, &notify);
                smb_raw_ntcancel(req);
-               status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
-               CHECK_STATUS(status, NT_STATUS_CANCELLED);
+               status = smb_raw_changenotify_recv(req, tctx, &notify);
+               torture_assert_ntstatus_equal_goto(tctx, status,
+                                                  NT_STATUS_CANCELLED,
+                                                  ret, done,
+                                                  "smb_raw_changenotify_recv");
        }
 
        /* trigger 2 events in each dir */
        for (i=0;i<ARRAY_SIZE(dirs);i++) {
-               char *path = talloc_asprintf(mem_ctx, "%s\\test.dir", dirs[i].path);
+               char *path = talloc_asprintf(tctx, "%s\\test.dir", dirs[i].path);
+               /*
+                * Make notifies a bit more interesting in a cluster
+                * by doing the changes against different nodes with
+                * --unclist
+                */
                smbcli_mkdir(cli->tree, path);
-               smbcli_rmdir(cli->tree, path);
+               smbcli_rmdir(cli2->tree, path);
                talloc_free(path);
        }
 
-       /* give a bit of time for the events to propogate */
+       /* give a bit of time for the events to propagate */
        tv = timeval_current();
 
        do {
@@ -1248,7 +1655,7 @@ static bool test_notify_tree(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                        req = smb_raw_changenotify_send(cli->tree, &notify);
                        smb_raw_ntcancel(req);
                        notify.nttrans.out.num_changes = 0;
-                       status = smb_raw_changenotify_recv(req, mem_ctx, &notify);
+                       status = smb_raw_changenotify_recv(req, tctx, &notify);
                        dirs[i].counted += notify.nttrans.out.num_changes;
                }
                
@@ -1261,14 +1668,14 @@ static bool test_notify_tree(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
                }
        } while (!all_done && timeval_elapsed(&tv) < 20);
 
-       printf("took %.4f seconds to propogate all events\n", timeval_elapsed(&tv));
+       torture_comment(tctx, "took %.4f seconds to propagate all events\n", timeval_elapsed(&tv));
 
        for (i=0;i<ARRAY_SIZE(dirs);i++) {
-               if (dirs[i].counted != dirs[i].expected) {
-                       printf("ERROR: i=%d expected %d got %d for '%s'\n",
-                              i, dirs[i].expected, dirs[i].counted, dirs[i].path);
-                       ret = false;
-               }
+               torture_assert_int_equal_goto(tctx,
+                       dirs[i].counted, dirs[i].expected, ret, done,
+                       talloc_asprintf(tctx,
+                                       "unexpected number of events for '%s'",
+                                       dirs[i].path));
        }
 
        /*
@@ -1281,35 +1688,610 @@ static bool test_notify_tree(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 
 done:
        smb_raw_exit(cli->session);
+       smbcli_deltree(cli->tree, BASEDIR_CN1_TNT);
+       return ret;
+}
+
+/*
+   Test response when cached server events exceed single NT NOTFIY response
+   packet size.
+*/
+
+#define BASEDIR_CN1_NO BASEDIR "_CN1_NO"
+
+static bool test_notify_overflow(struct torture_context *tctx,
+                                struct smbcli_state *cli)
+{
+       bool ret = true;
+       NTSTATUS status;
+       union smb_notify notify;
+       union smb_open io;
+       int fnum;
+       int count = 100;
+       struct smbcli_request *req1;
+       int i;
+
+       torture_comment(tctx, "TESTING CHANGE NOTIFY EVENT OVERFLOW\n");
+
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR_CN1_NO),
+                      "Failed to setup up test directory: " BASEDIR_CN1_NO);
+
+       /* get a handle on the directory */
+       io.generic.level = RAW_OPEN_NTCREATEX;
+       io.ntcreatex.in.root_fid.fnum = 0;
+       io.ntcreatex.in.flags = 0;
+       io.ntcreatex.in.access_mask = SEC_FILE_ALL;
+       io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ |
+           NTCREATEX_SHARE_ACCESS_WRITE;
+       io.ntcreatex.in.alloc_size = 0;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
+       io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
+       io.ntcreatex.in.security_flags = 0;
+       io.ntcreatex.in.fname = BASEDIR_CN1_NO;
+
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
+       fnum = io.ntcreatex.out.file.fnum;
+
+       /* ask for a change notify, on name changes. */
+       notify.nttrans.level = RAW_NOTIFY_NTTRANS;
+       notify.nttrans.in.buffer_size = 1000;
+       notify.nttrans.in.completion_filter = FILE_NOTIFY_CHANGE_NAME;
+       notify.nttrans.in.file.fnum = fnum;
+
+       notify.nttrans.in.recursive = true;
+       req1 = smb_raw_changenotify_send(cli->tree, &notify);
+
+       /* cancel initial requests so the buffer is setup */
+       smb_raw_ntcancel(req1);
+       status = smb_raw_changenotify_recv(req1, tctx, &notify);
+       torture_assert_ntstatus_equal_goto(tctx, status,
+                                          NT_STATUS_CANCELLED,
+                                          ret, done,
+                                          "smb_raw_changenotify_recv");
+
+       /* open a lot of files, filling up the server side notify buffer */
+       torture_comment(tctx, "Testing overflowed buffer notify on create of %d files\n",
+              count);
+       for (i=0;i<count;i++) {
+               char *fname = talloc_asprintf(cli,
+                               BASEDIR_CN1_NO "\\test%d.txt", i);
+               int fnum2 = smbcli_open(cli->tree, fname, O_CREAT|O_RDWR,
+                                       DENY_NONE);
+               torture_assert_int_not_equal_goto(tctx, fnum2, -1, ret, done,
+                       talloc_asprintf(tctx, "Failed to create %s - %s",
+                                       fname, smbcli_errstr(cli->tree)));
+               talloc_free(fname);
+               smbcli_close(cli->tree, fnum2);
+       }
+
+       /* expect that 0 events will be returned with NT_STATUS_OK */
+       req1 = smb_raw_changenotify_send(cli->tree, &notify);
+       status = smb_raw_changenotify_recv(req1, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     0, ret, done, "no changes expected");
+
+done:
+       smb_raw_exit(cli->session);
+       smbcli_deltree(cli->tree, BASEDIR_CN1_NO);
+       return ret;
+}
+
+/*
+   Test if notifications are returned for changes to the base directory.
+   They shouldn't be.
+*/
+
+#define BASEDIR_CN1_NBASE BASEDIR "_CN1_NBASE"
+
+static bool test_notify_basedir(struct torture_context *tctx,
+                               struct smbcli_state *cli)
+{
+       bool ret = true;
+       NTSTATUS status;
+       union smb_notify notify;
+       union smb_open io;
+       int fnum;
+       struct smbcli_request *req1;
+
+       torture_comment(tctx, "TESTING CHANGE NOTIFY BASEDIR EVENTS\n");
+
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR_CN1_NBASE),
+                      "Failed to setup up test directory: " BASEDIR_CN1_NBASE);
+
+       /* get a handle on the directory */
+       io.generic.level = RAW_OPEN_NTCREATEX;
+       io.ntcreatex.in.root_fid.fnum = 0;
+       io.ntcreatex.in.flags = 0;
+       io.ntcreatex.in.access_mask = SEC_FILE_ALL;
+       io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ |
+           NTCREATEX_SHARE_ACCESS_WRITE;
+       io.ntcreatex.in.alloc_size = 0;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
+       io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
+       io.ntcreatex.in.security_flags = 0;
+       io.ntcreatex.in.fname = BASEDIR_CN1_NBASE;
+
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
+       fnum = io.ntcreatex.out.file.fnum;
+
+       /* create a test file that will also be modified */
+       smbcli_close(cli->tree, smbcli_open(cli->tree,
+                               BASEDIR_CN1_NBASE "\\tname1",
+                                           O_CREAT, 0));
+
+       /* ask for a change notify, on attribute changes. */
+       notify.nttrans.level = RAW_NOTIFY_NTTRANS;
+       notify.nttrans.in.buffer_size = 1000;
+       notify.nttrans.in.completion_filter = FILE_NOTIFY_CHANGE_ATTRIBUTES;
+       notify.nttrans.in.file.fnum = fnum;
+       notify.nttrans.in.recursive = true;
+
+       req1 = smb_raw_changenotify_send(cli->tree, &notify);
+
+       /* set attribute on the base dir */
+       smbcli_setatr(cli->tree, BASEDIR_CN1_NBASE, FILE_ATTRIBUTE_HIDDEN, 0);
+
+       /* set attribute on a file to assure we receive a notification */
+       smbcli_setatr(cli->tree, BASEDIR_CN1_NBASE "\\tname1",
+                       FILE_ATTRIBUTE_HIDDEN, 0);
+       smb_msleep(200);
+
+       /* check how many responses were given, expect only 1 for the file */
+       status = smb_raw_changenotify_recv(req1, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of  changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_MODIFIED, ret, done,
+                                     "wrong action (exp: MODIFIED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "tname1",
+                  STR_UNICODE);
+
+done:
+       smb_raw_exit(cli->session);
+       smbcli_deltree(cli->tree, BASEDIR_CN1_NBASE);
        return ret;
 }
 
+
+/*
+  create a secondary tree connect - used to test for a bug in Samba3 messaging
+  with change notify
+*/
+
+static struct smbcli_tree *secondary_tcon(struct smbcli_state *cli, 
+                                         struct torture_context *tctx)
+{
+       NTSTATUS status;
+       const char *share, *host;
+       struct smbcli_tree *tree;
+       union smb_tcon tcon;
+
+       share = torture_setting_string(tctx, "share", NULL);
+       host  = torture_setting_string(tctx, "host", NULL);
+       
+       torture_comment(tctx, "create a second tree context on the same session\n");
+       tree = smbcli_tree_init(cli->session, tctx, false);
+
+       tcon.generic.level = RAW_TCON_TCONX;
+       tcon.tconx.in.flags = TCONX_FLAG_EXTENDED_RESPONSE;
+       tcon.tconx.in.password = data_blob(NULL, 0);
+       tcon.tconx.in.path = talloc_asprintf(tctx, "\\\\%s\\%s", host, share);
+       tcon.tconx.in.device = "A:";    
+       status = smb_raw_tcon(tree, tctx, &tcon);
+       if (!NT_STATUS_IS_OK(status)) {
+               talloc_free(tree);
+               torture_comment(tctx, "Failed to create secondary tree\n");
+               return NULL;
+       }
+
+       tree->tid = tcon.tconx.out.tid;
+       torture_comment(tctx, "tid1=%d tid2=%d\n", cli->tree->tid, tree->tid);
+
+       return tree;
+}
+
+
 /* 
-   basic testing of change notify
+   very simple change notify test
 */
-bool torture_raw_notify(struct torture_context *torture, 
-                       struct smbcli_state *cli, 
-                       struct smbcli_state *cli2)
+
+#define BASEDIR_CN1_NTCON BASEDIR "_CN1_NTCON"
+
+static bool test_notify_tcon(struct torture_context *tctx,
+                            struct smbcli_state *cli)
 {
        bool ret = true;
+       NTSTATUS status;
+       union smb_notify notify;
+       union smb_open io;
+       int fnum;
+       struct smbcli_request *req;
+       extern int torture_numops;
+       struct smbcli_tree *tree = NULL;
                
-       if (!torture_setup_dir(cli, BASEDIR)) {
-               return false;
-       }
+       torture_comment(tctx, "TESTING SIMPLE CHANGE NOTIFY\n");
 
-       ret &= test_notify_dir(cli, cli2, torture);
-       ret &= test_notify_mask(cli, torture);
-       ret &= test_notify_recursive(cli, torture);
-       ret &= test_notify_mask_change(cli, torture);
-       ret &= test_notify_file(cli, torture);
-       ret &= test_notify_tdis(torture);
-       ret &= test_notify_exit(torture);
-       ret &= test_notify_ulogoff(torture);
-       ret &= test_notify_tcp_dis(torture);
-       ret &= test_notify_double(cli, torture);
-       ret &= test_notify_tree(cli, torture);
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR_CN1_NTCON),
+                      "Failed to setup up test directory: " BASEDIR_CN1_NTCON);
+
+       /*
+         get a handle on the directory
+       */
+       io.generic.level = RAW_OPEN_NTCREATEX;
+       io.ntcreatex.in.root_fid.fnum = 0;
+       io.ntcreatex.in.flags = 0;
+       io.ntcreatex.in.access_mask = SEC_FILE_ALL;
+       io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ | NTCREATEX_SHARE_ACCESS_WRITE;
+       io.ntcreatex.in.alloc_size = 0;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
+       io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
+       io.ntcreatex.in.security_flags = 0;
+       io.ntcreatex.in.fname = BASEDIR_CN1_NTCON;
+
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
+       fnum = io.ntcreatex.out.file.fnum;
+
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_open");
+
+       /* ask for a change notify,
+          on file or directory name changes */
+       notify.nttrans.level = RAW_NOTIFY_NTTRANS;
+       notify.nttrans.in.buffer_size = 1000;
+       notify.nttrans.in.completion_filter = FILE_NOTIFY_CHANGE_NAME;
+       notify.nttrans.in.file.fnum = fnum;
+       notify.nttrans.in.recursive = true;
+
+       torture_comment(tctx, "Testing notify mkdir\n");
+       req = smb_raw_changenotify_send(cli->tree, &notify);
+       smbcli_mkdir(cli->tree, BASEDIR_CN1_NTCON "\\subdir-name");
 
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_ADDED, ret, done,
+                                     "wrong action (exp: ADDED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subdir-name",
+                  STR_UNICODE);
+
+       torture_comment(tctx, "Testing notify rmdir\n");
+       req = smb_raw_changenotify_send(cli->tree, &notify);
+       smbcli_rmdir(cli->tree, BASEDIR_CN1_NTCON "\\subdir-name");
+
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_REMOVED, ret, done,
+                                     "wrong action (exp: REMOVED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subdir-name",
+                  STR_UNICODE);
+
+       torture_comment(tctx, "SIMPLE CHANGE NOTIFY OK\n");
+
+       torture_comment(tctx, "TESTING WITH SECONDARY TCON\n");
+       tree = secondary_tcon(cli, tctx);
+       torture_assert_not_null_goto(tctx, tree, ret, done,
+                                    "failed to create secondary tcon");
+
+       torture_comment(tctx, "Testing notify mkdir\n");
+       req = smb_raw_changenotify_send(cli->tree, &notify);
+       smbcli_mkdir(cli->tree, BASEDIR_CN1_NTCON "\\subdir-name");
+
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_ADDED, ret, done,
+                                     "wrong action (exp: ADDED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subdir-name",
+                  STR_UNICODE);
+
+       torture_comment(tctx, "Testing notify rmdir\n");
+       req = smb_raw_changenotify_send(cli->tree, &notify);
+       smbcli_rmdir(cli->tree, BASEDIR_CN1_NTCON "\\subdir-name");
+
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_REMOVED, ret, done,
+                                     "wrong action (exp: REMOVED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subdir-name",
+                  STR_UNICODE);
+
+       torture_comment(tctx, "CHANGE NOTIFY WITH TCON OK\n");
+
+       torture_comment(tctx, "Disconnecting secondary tree\n");
+       status = smb_tree_disconnect(tree);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_tree_disconnect");
+       talloc_free(tree);
+
+       torture_comment(tctx, "Testing notify mkdir\n");
+       req = smb_raw_changenotify_send(cli->tree, &notify);
+       smbcli_mkdir(cli->tree, BASEDIR_CN1_NTCON "\\subdir-name");
+
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_ADDED, ret, done,
+                                     "wrong action (exp: ADDED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subdir-name",
+                  STR_UNICODE);
+
+       torture_comment(tctx, "Testing notify rmdir\n");
+       req = smb_raw_changenotify_send(cli->tree, &notify);
+       smbcli_rmdir(cli->tree, BASEDIR_CN1_NTCON "\\subdir-name");
+
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
+                                       "smb_raw_changenotify_recv");
+       torture_assert_int_equal_goto(tctx, notify.nttrans.out.num_changes,
+                                     1, ret, done, "wrong number of changes");
+       torture_assert_int_equal_goto(tctx,
+                                     notify.nttrans.out.changes[0].action,
+                                     NOTIFY_ACTION_REMOVED, ret, done,
+                                     "wrong action (exp: REMOVED)");
+       CHECK_WSTR(tctx, notify.nttrans.out.changes[0].name, "subdir-name",
+                  STR_UNICODE);
+
+       torture_comment(tctx, "CHANGE NOTIFY WITH TDIS OK\n");
+done:
        smb_raw_exit(cli->session);
-       smbcli_deltree(cli->tree, BASEDIR);
+       smbcli_deltree(cli->tree, BASEDIR_CN1_NTCON);
        return ret;
 }
+
+struct cb_data {
+       struct smbcli_request *req;
+       bool timed_out;
+};
+
+static void timeout_cb(struct tevent_context *ev,
+                       struct tevent_timer *te,
+                       struct timeval current_time,
+                       void *private_data)
+{
+       struct cb_data *cbp = (struct cb_data *)private_data;
+       cbp->req->state = SMBCLI_REQUEST_ERROR;
+       cbp->timed_out = true;
+}
+
+/*
+   testing alignment of multiple change notify infos
+*/
+
+#define BASEDIR_CN1_NALIGN BASEDIR "_CN1_NALIGN"
+
+static bool test_notify_alignment(struct torture_context *tctx,
+                                 struct smbcli_state *cli)
+{
+       NTSTATUS status;
+       union smb_notify notify;
+       union smb_open io;
+       int fnum, fnum2;
+       struct smbcli_request *req;
+       const char *fname = BASEDIR_CN1_NALIGN "\\starter";
+       const char *fnames[] = { "a",
+                                "ab",
+                                "abc",
+                                "abcd" };
+       bool fnames_received[] = {false,
+                                 false,
+                                 false,
+                                 false};
+       size_t total_names_received = 0;
+       size_t num_names = ARRAY_SIZE(fnames);
+       size_t i;
+       char *fpath = NULL;
+
+       torture_comment(tctx, "TESTING CHANGE NOTIFY REPLY ALIGNMENT\n");
+
+       torture_assert(tctx, torture_setup_dir(cli, BASEDIR_CN1_NALIGN),
+               "Failed to setup up test directory: " BASEDIR_CN1_NALIGN);
+
+       /* get a handle on the directory */
+       io.generic.level = RAW_OPEN_NTCREATEX;
+       io.ntcreatex.in.root_fid.fnum = 0;
+       io.ntcreatex.in.flags = 0;
+       io.ntcreatex.in.access_mask = SEC_FILE_ALL;
+       io.ntcreatex.in.create_options = NTCREATEX_OPTIONS_DIRECTORY;
+       io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+       io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_READ |
+                                      NTCREATEX_SHARE_ACCESS_WRITE;
+       io.ntcreatex.in.alloc_size = 0;
+       io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN;
+       io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
+       io.ntcreatex.in.security_flags = 0;
+       io.ntcreatex.in.fname = BASEDIR_CN1_NALIGN;
+
+       status = smb_raw_open(cli->tree, tctx, &io);
+       torture_assert_ntstatus_ok(tctx, status, "smb_raw_open");
+       fnum = io.ntcreatex.out.file.fnum;
+
+       /* ask for a change notify, on file creation */
+       notify.nttrans.level = RAW_NOTIFY_NTTRANS;
+       notify.nttrans.in.buffer_size = 1000;
+       notify.nttrans.in.completion_filter = FILE_NOTIFY_CHANGE_FILE_NAME;
+       notify.nttrans.in.file.fnum = fnum;
+       notify.nttrans.in.recursive = false;
+
+       /* start change tracking */
+       req = smb_raw_changenotify_send(cli->tree, &notify);
+
+       fnum2 = smbcli_open(cli->tree, fname, O_CREAT|O_RDWR, DENY_NONE);
+       torture_assert(tctx, fnum2 != -1, smbcli_errstr(cli->tree));
+       smbcli_close(cli->tree, fnum2);
+
+       status = smb_raw_changenotify_recv(req, tctx, &notify);
+       torture_assert_ntstatus_ok(tctx, status, "smb_raw_changenotify_recv");
+
+       /* create 4 files that will cause CHANGE_NOTIFY_INFO structures
+        * to be returned in the same packet with all possible 4-byte padding
+        * permutations.  As per MS-CIFS 2.2.7.4.2 these structures should be
+        * 4-byte aligned. */
+
+       for (i = 0; i < num_names; i++) {
+               fpath = talloc_asprintf(tctx, "%s\\%s",
+                               BASEDIR_CN1_NALIGN, fnames[i]);
+               fnum2 = smbcli_open(cli->tree, fpath,
+                   O_CREAT|O_RDWR, DENY_NONE);
+               torture_assert(tctx, fnum2 != -1, smbcli_errstr(cli->tree));
+               smbcli_close(cli->tree, fnum2);
+               talloc_free(fpath);
+       }
+
+       /*
+        * Slow cloud filesystems mean we might
+        * not get everything in one go. Keep going
+        * until we get them all.
+        */
+       while (total_names_received < num_names) {
+               struct tevent_timer *te = NULL;
+               struct cb_data to_data = {0};
+
+               /*
+                * We send a notify packet, and let
+                * smb_raw_changenotify_recv() do
+                * the alignment checking for us.
+                */
+               req = smb_raw_changenotify_send(cli->tree, &notify);
+               torture_assert(tctx,
+                       req != NULL,
+                       "smb_raw_changenotify_send failed\n");
+
+               /* Ensure we don't wait more than 30 seconds. */
+               to_data.req = req;
+               to_data.timed_out = false;
+
+               te = tevent_add_timer(tctx->ev,
+                               req,
+                               tevent_timeval_current_ofs(30, 0),
+                               timeout_cb,
+                               &to_data);
+               if (te == NULL) {
+                       torture_fail(tctx, "tevent_add_timer fail\n");
+               }
+
+               status = smb_raw_changenotify_recv(req, tctx, &notify);
+               if (!NT_STATUS_IS_OK(status)) {
+                       if (to_data.timed_out == true) {
+                               torture_fail(tctx, "smb_raw_changenotify_recv "
+                                       "timed out\n");
+                       }
+               }
+
+               torture_assert_ntstatus_ok(tctx, status,
+                       "smb_raw_changenotify_recv");
+
+               for (i = 0; i < notify.nttrans.out.num_changes; i++) {
+                       size_t j;
+
+                       /* Ensure it was an 'add'. */
+                       torture_assert(tctx,
+                               notify.nttrans.out.changes[i].action ==
+                                       NOTIFY_ACTION_ADDED,
+                               "");
+
+                       for (j = 0; j < num_names; j++) {
+                               if (strcmp(notify.nttrans.out.changes[i].name.s,
+                                               fnames[j]) == 0) {
+                                       if (fnames_received[j] == true) {
+                                               const char *err =
+                                                       talloc_asprintf(tctx,
+                                                               "Duplicate "
+                                                               "name %s\n",
+                                                               fnames[j]);
+                                               if (err == NULL) {
+                                                       torture_fail(tctx,
+                                                               "talloc "
+                                                               "fail\n");
+                                               }
+                                               /* already got this. */
+                                               torture_fail(tctx, err);
+                                       }
+                                       fnames_received[j] = true;
+                                       break;
+                               }
+                       }
+                       if (j == num_names) {
+                               /* No name match. */
+                               const char *err = talloc_asprintf(tctx,
+                                       "Unexpected name %s\n",
+                                       notify.nttrans.out.changes[i].name.s);
+                               if (err == NULL) {
+                                       torture_fail(tctx, "talloc fail\n");
+                               }
+                               torture_fail(tctx, err);
+                       }
+                       total_names_received++;
+               }
+       }
+
+       smb_raw_exit(cli->session);
+       smbcli_deltree(cli->tree, BASEDIR_CN1_NALIGN);
+       return true;
+}
+
+struct torture_suite *torture_raw_notify(TALLOC_CTX *mem_ctx)
+{
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "notify");
+
+       torture_suite_add_1smb_test(suite, "tcon", test_notify_tcon);
+       torture_suite_add_2smb_test(suite, "dir", test_notify_dir);
+       torture_suite_add_2smb_test(suite, "mask", test_notify_mask);
+       torture_suite_add_2smb_test(suite, "recursive", test_notify_recursive);
+       torture_suite_add_1smb_test(suite, "mask_change",
+                                   test_notify_mask_change);
+       torture_suite_add_1smb_test(suite, "file", test_notify_file);
+       torture_suite_add_1smb_test(suite, "tdis", test_notify_tdis);
+       torture_suite_add_1smb_test(suite, "exit", test_notify_exit);
+       torture_suite_add_1smb_test(suite, "ulogoff", test_notify_ulogoff);
+       torture_suite_add_1smb_test(suite, "tcp_dis", test_notify_tcp_dis);
+       torture_suite_add_1smb_test(suite, "double", test_notify_double);
+       torture_suite_add_2smb_test(suite, "tree", test_notify_tree);
+       torture_suite_add_1smb_test(suite, "overflow", test_notify_overflow);
+       torture_suite_add_1smb_test(suite, "basedir", test_notify_basedir);
+       torture_suite_add_1smb_test(suite, "alignment", test_notify_alignment);
+
+       return suite;
+}