torture: Split the fsinfo check into a separate test

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Aug 23 20:53:12 CEST 2013 on sn-devel-104

diff --git a/selftest/knownfail b/selftest/knownfail
index 1c1bff8d3eff9099ae980f6e674186c9bc26b169..dd536df57af822f599554f9789e1e3de15a32985 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -207,6 +207,7 @@
 ^samba3.smb2.streams.rename2
 ^samba3.smb2.streams.attributes
 ^samba3.smb2.getinfo.complex
+^samba3.smb2.getinfo.fsinfo # quotas don't work yet
 ^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 7e37c88aaa064b08573ac31a8050c8b548b7b2a2..10dd550cdd4a5500e3a8899651ed8ac1029556b6 100644 (file)
--- a/source4/torture/smb2/getinfo.c
+++ b/source4/torture/smb2/getinfo.c
@@ -127,13 +127,19 @@ static bool torture_smb2_fileinfo(struct torture_context *tctx, struct smb2_tree
 /*
   test fsinfo levels
 */
-static bool torture_smb2_fsinfo(struct torture_context *tctx, struct smb2_tree *tree)
+static bool torture_smb2_fsinfo(struct torture_context *tctx)
 {
+       bool ret;
+       struct smb2_tree *tree;
        int i;
        NTSTATUS status;
        struct smb2_handle handle;
 
        printf("Testing fsinfo levels\n");
+
+       ret = torture_smb2_connection(tctx, &tree);
+       torture_assert(tctx, ret, "connection failed");
+
        status = smb2_util_roothandle(tree, &handle);
        torture_assert_ntstatus_ok(tctx, status, "Unable to create root handle");
 
@@ -214,7 +220,6 @@ static bool torture_smb2_getinfo(struct torture_context *torture)
                                   "setup complex dir " DNAME ":streamtwo");
 
        ret &= torture_smb2_fileinfo(torture, tree);
-       ret &= torture_smb2_fsinfo(torture, tree);
 
        return ret;
 }
@@ -225,6 +230,7 @@ struct torture_suite *torture_smb2_getinfo_init(void)
                talloc_autofree_context(), "getinfo");
 
        torture_suite_add_simple_test(suite, "complex", torture_smb2_getinfo);
+       torture_suite_add_simple_test(suite, "fsinfo",  torture_smb2_fsinfo);
        torture_suite_add_simple_test(suite, "buffercheck",
                                      torture_smb2_buffercheck);
        return suite;