summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-04-18 12:49:55 +0200
committerVolker Lendecke <vl@samba.org>2012-04-18 13:42:14 +0200
commitd1a898a76b0305f89a29fcbb8d026ddbd346b77c (patch)
tree4de55669b010cac9ec538d818ff010fc33ad477b
parentc180cd04685d180d849e507ce5f2411f89b04d4a (diff)
downloadsamba-d1a898a76b0305f89a29fcbb8d026ddbd346b77c.tar.gz
samba-d1a898a76b0305f89a29fcbb8d026ddbd346b77c.tar.bz2
samba-d1a898a76b0305f89a29fcbb8d026ddbd346b77c.zip
s4-torture: Separate out the notify double subtest
-rw-r--r--source4/torture/raw/notify.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index dc6a4a7a97..b85ff5b782 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -1151,7 +1151,8 @@ done:
/*
test setting up two change notify requests on one handle
*/
-static bool test_notify_double(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_notify_double(struct torture_context *mem_ctx,
+ struct smbcli_state *cli)
{
bool ret = true;
NTSTATUS status;
@@ -1162,6 +1163,9 @@ static bool test_notify_double(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
printf("TESTING CHANGE NOTIFY TWICE ON ONE DIRECTORY\n");
+ if (!torture_setup_dir(cli, BASEDIR)) {
+ return false;
+ }
/*
get a handle on the directory
*/
@@ -1209,6 +1213,7 @@ static bool test_notify_double(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
done:
smb_raw_exit(cli->session);
+ smbcli_deltree(cli->tree, BASEDIR);
return ret;
}
@@ -1764,7 +1769,6 @@ static bool test_raw_notify_all(struct torture_context *torture,
return false;
}
- ret &= test_notify_double(cli, torture);
ret &= test_notify_tree(cli, torture);
ret &= test_notify_overflow(cli, torture);
ret &= test_notify_basedir(cli, torture);
@@ -1790,6 +1794,7 @@ struct torture_suite *torture_raw_notify(TALLOC_CTX *mem_ctx)
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, "all", test_raw_notify_all);
return suite;