summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-04-18 12:51:26 +0200
committerVolker Lendecke <vl@samba.org>2012-04-18 13:42:14 +0200
commita7cff2b72e85b2bc919f1dcb30bd009a54d47354 (patch)
tree8091e7490c25e1c203e6a30d86af96611f1059a3 /source4
parentd1a898a76b0305f89a29fcbb8d026ddbd346b77c (diff)
downloadsamba-a7cff2b72e85b2bc919f1dcb30bd009a54d47354.tar.gz
samba-a7cff2b72e85b2bc919f1dcb30bd009a54d47354.tar.bz2
samba-a7cff2b72e85b2bc919f1dcb30bd009a54d47354.zip
s4-torture: Separate out the notify tree subtest
Diffstat (limited to 'source4')
-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 b85ff5b782..3ebdc0ce06 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -1221,7 +1221,8 @@ 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)
+static bool test_notify_tree(struct torture_context *mem_ctx,
+ struct smbcli_state *cli)
{
bool ret = true;
union smb_notify notify;
@@ -1263,6 +1264,10 @@ static bool test_notify_tree(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
printf("TESTING CHANGE NOTIFY FOR DIFFERENT DEPTHS\n");
+ if (!torture_setup_dir(cli, BASEDIR)) {
+ return false;
+ }
+
io.generic.level = RAW_OPEN_NTCREATEX;
io.ntcreatex.in.root_fid.fnum = 0;
io.ntcreatex.in.flags = 0;
@@ -1347,6 +1352,7 @@ static bool test_notify_tree(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
done:
smb_raw_exit(cli->session);
+ smbcli_deltree(cli->tree, BASEDIR);
return ret;
}
@@ -1769,7 +1775,6 @@ static bool test_raw_notify_all(struct torture_context *torture,
return false;
}
- ret &= test_notify_tree(cli, torture);
ret &= test_notify_overflow(cli, torture);
ret &= test_notify_basedir(cli, torture);
ret &= test_notify_alignment(cli, torture);
@@ -1795,6 +1800,7 @@ struct torture_suite *torture_raw_notify(TALLOC_CTX *mem_ctx)
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_1smb_test(suite, "tree", test_notify_tree);
torture_suite_add_2smb_test(suite, "all", test_raw_notify_all);
return suite;