summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-04-18 12:54:25 +0200
committerVolker Lendecke <vl@samba.org>2012-04-18 13:42:14 +0200
commit6b445cdfc6c8767f8e09ee847f5840ab0e20031b (patch)
treef85ff0251520eb55bd5e0e773d1250a2299b64a1
parent98f8f4236c363fe9f97fd4fca154be9258b1652a (diff)
downloadsamba-6b445cdfc6c8767f8e09ee847f5840ab0e20031b.tar.gz
samba-6b445cdfc6c8767f8e09ee847f5840ab0e20031b.tar.bz2
samba-6b445cdfc6c8767f8e09ee847f5840ab0e20031b.zip
s4-torture: Separate out the notify basedir 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 ae936f4d92..37723ac79d 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -1444,7 +1444,8 @@ done:
Test if notifications are returned for changes to the base directory.
They shouldn't be.
*/
-static bool test_notify_basedir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_notify_basedir(struct torture_context *mem_ctx,
+ struct smbcli_state *cli)
{
bool ret = true;
NTSTATUS status;
@@ -1455,6 +1456,10 @@ static bool test_notify_basedir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
printf("TESTING CHANGE NOTIFY BASEDIR EVENTS\n");
+ if (!torture_setup_dir(cli, BASEDIR)) {
+ return false;
+ }
+
/* get a handle on the directory */
io.generic.level = RAW_OPEN_NTCREATEX;
io.ntcreatex.in.root_fid.fnum = 0;
@@ -1503,6 +1508,7 @@ static bool test_notify_basedir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
done:
smb_raw_exit(cli->session);
+ smbcli_deltree(cli->tree, BASEDIR);
return ret;
}
@@ -1781,7 +1787,6 @@ static bool test_raw_notify_all(struct torture_context *torture,
return false;
}
- ret &= test_notify_basedir(cli, torture);
ret &= test_notify_alignment(cli, torture);
smb_raw_exit(cli->session);
@@ -1807,6 +1812,7 @@ struct torture_suite *torture_raw_notify(TALLOC_CTX *mem_ctx)
torture_suite_add_1smb_test(suite, "double", test_notify_double);
torture_suite_add_1smb_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_2smb_test(suite, "all", test_raw_notify_all);
return suite;