torture: Change smb2.getinfo into a suite

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/selftest/knownfail b/selftest/knownfail
index c075ba62b5f1fe0012d1eeac6d9420b195f84910..1c1bff8d3eff9099ae980f6e674186c9bc26b169 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -170,7 +170,7 @@
 ^samba4.smb2.oplock.batch10\(.*\)$ # samba 4 oplocks are a mess
 ^samba4.smb2.oplock.batch20\(.*\)$ # samba 4 oplocks are a mess
 ^samba4.smb2.oplock.stream1 # samba 4 oplocks are a mess
-^samba4.smb2.getinfo.getinfo # streams on directories does not work
+^samba4.smb2.getinfo.complex # streams on directories does not work
 ^samba4.ntvfs.cifs.krb5.base.createx_access.createx_access\(.*\)$
 ^samba4.rpc.lsa.forest.trust #Not fully provided by Samba4
 ^samba4.blackbox.kinit\(.*\).kinit with user password for expired password\(.*\) # We need to work out why this fails only during the pw change
@@ -206,7 +206,7 @@
 ^samba3.smb2.streams.rename
 ^samba3.smb2.streams.rename2
 ^samba3.smb2.streams.attributes
-^samba3.smb2.getinfo.getinfo
+^samba3.smb2.getinfo.complex
 ^samba3.smb2.setinfo.setinfo
 ^samba3.smb2.session.*reauth5 # some special anonymous checks?
 ^samba3.smb2.compound.interim2 # wrong return code (STATUS_CANCELLED)

diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c
index f407acc77b71290ce47acf2e8102a6c627d8f91f..f60db95088138f350d58600b7bd64f558c7d9973 100644 (file)
--- 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 f6a31633af9b5ec96a0876fa0587f849164a9858..19d7e4ae92a70c4bb566007c7965032ec872495a 100644 (file)
--- 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());