summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-04-18 12:22:31 +0200
committerVolker Lendecke <vl@samba.org>2012-04-18 13:42:13 +0200
commit87e2a549e961c720b4dca98ad2d495d61944f251 (patch)
tree7b9a4225134648f90fa9f919d20554b49ed4043e
parent74f134df721b323a5b26bfa813528b32520785a6 (diff)
downloadsamba-87e2a549e961c720b4dca98ad2d495d61944f251.tar.gz
samba-87e2a549e961c720b4dca98ad2d495d61944f251.tar.bz2
samba-87e2a549e961c720b4dca98ad2d495d61944f251.zip
s4-torture: Separate out the notify mask subtest
-rw-r--r--source4/torture/raw/notify.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index a41630cbde..cd2b537f41 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -558,7 +558,8 @@ done:
/*
testing of mask bits for change notify
*/
-static bool test_notify_mask(struct smbcli_state *cli, struct torture_context *tctx)
+static bool test_notify_mask(struct torture_context *tctx,
+ struct smbcli_state *cli)
{
bool ret = true;
NTSTATUS status;
@@ -573,6 +574,10 @@ static bool test_notify_mask(struct smbcli_state *cli, struct torture_context *t
printf("TESTING CHANGE NOTIFY COMPLETION FILTERS\n");
+ if (!torture_setup_dir(cli, BASEDIR)) {
+ return false;
+ }
+
tv = timeval_current_ofs(1000, 0);
t = timeval_to_nttime(&tv);
@@ -787,6 +792,7 @@ static bool test_notify_mask(struct smbcli_state *cli, struct torture_context *t
done:
smb_raw_exit(cli->session);
+ smbcli_deltree(cli->tree, BASEDIR);
return ret;
}
@@ -1716,7 +1722,6 @@ static bool test_raw_notify_all(struct torture_context *torture,
return false;
}
- 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);
@@ -1741,6 +1746,7 @@ struct torture_suite *torture_raw_notify(TALLOC_CTX *mem_ctx)
torture_suite_add_1smb_test(suite, "tcon", test_notify_tcon);
torture_suite_add_2smb_test(suite, "dir", test_notify_dir);
+ torture_suite_add_1smb_test(suite, "mask", test_notify_mask);
torture_suite_add_2smb_test(suite, "all", test_raw_notify_all);
return suite;