From 8f96d489715d88c181d88030550a88a7e245e5ae Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 22 Aug 2013 11:06:59 +0000 Subject: torture: Change smb2.getinfo into a suite Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source4/torture/smb2/getinfo.c | 11 ++++++++++- source4/torture/smb2/smb2.c | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'source4') diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c index f407acc77b..f60db95088 100644 --- a/source4/torture/smb2/getinfo.c +++ b/source4/torture/smb2/getinfo.c @@ -179,7 +179,7 @@ static bool torture_smb2_buffercheck(struct torture_context *tctx, struct smb2_t /* basic testing of all SMB2 getinfo levels */ -bool torture_smb2_getinfo(struct torture_context *torture) +static bool torture_smb2_getinfo(struct torture_context *torture) { struct smb2_tree *tree; bool ret = true; @@ -213,3 +213,12 @@ bool torture_smb2_getinfo(struct torture_context *torture) return ret; } + +struct torture_suite *torture_smb2_getinfo_init(void) +{ + struct torture_suite *suite = torture_suite_create( + talloc_autofree_context(), "getinfo"); + + torture_suite_add_simple_test(suite, "complex", torture_smb2_getinfo); + return suite; +} diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c index f6a31633af..19d7e4ae92 100644 --- a/source4/torture/smb2/smb2.c +++ b/source4/torture/smb2/smb2.c @@ -148,7 +148,7 @@ NTSTATUS torture_smb2_init(void) struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "smb2"); torture_suite_add_simple_test(suite, "connect", torture_smb2_connect); torture_suite_add_suite(suite, torture_smb2_scan_init()); - torture_suite_add_simple_test(suite, "getinfo", torture_smb2_getinfo); + torture_suite_add_suite(suite, torture_smb2_getinfo_init()); torture_suite_add_simple_test(suite, "setinfo", torture_smb2_setinfo); torture_suite_add_suite(suite, torture_smb2_lock_init()); torture_suite_add_suite(suite, torture_smb2_read_init()); -- cgit