summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-04-18 12:27:38 +0200
committerVolker Lendecke <vl@samba.org>2012-04-18 13:42:13 +0200
commit6f6192b9980c11c7fed98c2f038fd2803a6ab92b (patch)
tree9862d3e87fde6a3ac015b5b22bf665bd6679df76
parent5429593eed1244315d1f9edef4051d32cb34cb91 (diff)
downloadsamba-6f6192b9980c11c7fed98c2f038fd2803a6ab92b.tar.gz
samba-6f6192b9980c11c7fed98c2f038fd2803a6ab92b.tar.bz2
samba-6f6192b9980c11c7fed98c2f038fd2803a6ab92b.zip
s4-torture: Separate out the notify mask_change subtest
-rw-r--r--source4/torture/raw/notify.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index b01c7c826d..e87452da00 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -446,7 +446,8 @@ done:
/*
testing of change notify mask change
*/
-static bool test_notify_mask_change(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_notify_mask_change(struct torture_context *mem_ctx,
+ struct smbcli_state *cli)
{
bool ret = true;
NTSTATUS status;
@@ -457,6 +458,10 @@ static bool test_notify_mask_change(struct smbcli_state *cli, TALLOC_CTX *mem_ct
printf("TESTING CHANGE NOTIFY WITH MASK CHANGE\n");
+ if (!torture_setup_dir(cli, BASEDIR)) {
+ return false;
+ }
+
/*
get a handle on the directory
*/
@@ -557,6 +562,7 @@ static bool test_notify_mask_change(struct smbcli_state *cli, TALLOC_CTX *mem_ct
done:
smb_raw_exit(cli->session);
+ smbcli_deltree(cli->tree, BASEDIR);
return ret;
}
@@ -1728,7 +1734,6 @@ static bool test_raw_notify_all(struct torture_context *torture,
return false;
}
- ret &= test_notify_mask_change(cli, torture);
ret &= test_notify_file(cli, torture);
ret &= test_notify_tdis(torture);
ret &= test_notify_exit(torture);
@@ -1753,6 +1758,8 @@ struct torture_suite *torture_raw_notify(TALLOC_CTX *mem_ctx)
torture_suite_add_2smb_test(suite, "dir", test_notify_dir);
torture_suite_add_1smb_test(suite, "mask", test_notify_mask);
torture_suite_add_1smb_test(suite, "recursive", test_notify_recursive);
+ torture_suite_add_1smb_test(suite, "mask_change",
+ test_notify_mask_change);
torture_suite_add_2smb_test(suite, "all", test_raw_notify_all);
return suite;