summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-04-18 12:31:12 +0200
committerVolker Lendecke <vl@samba.org>2012-04-18 13:42:13 +0200
commitb570668f5583a3eea3d2bf0755617f8d2e9ee4a4 (patch)
treee8f8fa32a32b377f5178b650823db1ade1eb436b
parent6f6192b9980c11c7fed98c2f038fd2803a6ab92b (diff)
downloadsamba-b570668f5583a3eea3d2bf0755617f8d2e9ee4a4.tar.gz
samba-b570668f5583a3eea3d2bf0755617f8d2e9ee4a4.tar.bz2
samba-b570668f5583a3eea3d2bf0755617f8d2e9ee4a4.zip
s4-torture: Separate out the notify file 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 e87452da00..b03285aa13 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -811,7 +811,8 @@ done:
/*
basic testing of change notify on files
*/
-static bool test_notify_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
+static bool test_notify_file(struct torture_context *mem_ctx,
+ struct smbcli_state *cli)
{
NTSTATUS status;
bool ret = true;
@@ -824,6 +825,10 @@ static bool test_notify_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
printf("TESTING CHANGE NOTIFY ON FILES\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;
@@ -865,6 +870,7 @@ static bool test_notify_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
done:
smb_raw_exit(cli->session);
+ smbcli_deltree(cli->tree, BASEDIR);
return ret;
}
@@ -1734,7 +1740,6 @@ static bool test_raw_notify_all(struct torture_context *torture,
return false;
}
- ret &= test_notify_file(cli, torture);
ret &= test_notify_tdis(torture);
ret &= test_notify_exit(torture);
ret &= test_notify_ulogoff(torture);
@@ -1760,6 +1765,7 @@ struct torture_suite *torture_raw_notify(TALLOC_CTX *mem_ctx)
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_1smb_test(suite, "file", test_notify_file);
torture_suite_add_2smb_test(suite, "all", test_raw_notify_all);
return suite;