From e5181d0460425abe6b1d06c783f4c225581e1acc Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 18 Apr 2012 12:44:21 +0200 Subject: s4-torture: Separate out the notify ulogoff subtest --- source4/torture/raw/notify.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source4') diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c index f11c46ea49..6ebbe7e58d 100644 --- a/source4/torture/raw/notify.c +++ b/source4/torture/raw/notify.c @@ -1012,7 +1012,8 @@ done: /* basic testing of change notifies followed by a ulogoff */ -static bool test_notify_ulogoff(struct torture_context *tctx) +static bool test_notify_ulogoff(struct torture_context *tctx, + struct smbcli_state *cli1) { bool ret = true; NTSTATUS status; @@ -1024,6 +1025,10 @@ static bool test_notify_ulogoff(struct torture_context *tctx) printf("TESTING CHANGE NOTIFY FOLLOWED BY ULOGOFF\n"); + if (!torture_setup_dir(cli1, BASEDIR)) { + return false; + } + if (!torture_open_connection(&cli, tctx, 0)) { return false; } @@ -1067,6 +1072,7 @@ static bool test_notify_ulogoff(struct torture_context *tctx) done: torture_close_connection(cli); + smbcli_deltree(cli1->tree, BASEDIR); return ret; } @@ -1752,7 +1758,6 @@ static bool test_raw_notify_all(struct torture_context *torture, return false; } - ret &= test_notify_ulogoff(torture); ret &= test_notify_tcp_dis(torture); ret &= test_notify_double(cli, torture); ret &= test_notify_tree(cli, torture); @@ -1778,6 +1783,7 @@ struct torture_suite *torture_raw_notify(TALLOC_CTX *mem_ctx) torture_suite_add_1smb_test(suite, "file", test_notify_file); torture_suite_add_1smb_test(suite, "tdis", test_notify_tdis); torture_suite_add_1smb_test(suite, "exit", test_notify_exit); + torture_suite_add_1smb_test(suite, "ulogoff", test_notify_ulogoff); torture_suite_add_2smb_test(suite, "all", test_raw_notify_all); return suite; -- cgit