s4:torture/smb2: remove samba specific stuff from smb2.oplock

metze
(cherry picked from commit 7a14f09f9cc14cfb6234175add1841faf751d51a)

diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c
index eeea03639abee021d36af1d028e4b793847920eb..ec263acf58f6fbbffcfd6d60a42fd572bd4e443a 100644 (file)
--- a/source4/torture/smb2/oplock.c
+++ b/source4/torture/smb2/oplock.c
@@ -2384,10 +2384,6 @@ static bool test_smb2_oplock_batch22(struct torture_context *tctx,
        int timeout = torture_setting_int(tctx, "oplocktimeout", 30);
        int te;
 
-       if (torture_setting_bool(tctx, "samba3", false)) {
-               torture_skip(tctx, "BATCH22 disabled against samba3\n");
-       }
-
        status = torture_smb2_testdir(tree1, BASEDIR, &h);
        torture_assert_ntstatus_ok(tctx, status, "Error creating directory");
 
@@ -2727,12 +2723,6 @@ static bool test_raw_oplock_stream1(struct torture_context *tctx,
                {&fname_default_stream, true,  SMB2_OPLOCK_LEVEL_EXCLUSIVE, SMB2_OPLOCK_LEVEL_II},
        };
 
-       /* Only passes against windows at the moment. */
-       if (torture_setting_bool(tctx, "samba3", false) ||
-           torture_setting_bool(tctx, "samba4", false)) {
-               torture_skip(tctx, "STREAM1 disabled against samba3+4\n");
-       }
-
        fname_stream = talloc_asprintf(tctx, "%s:%s", fname_base, stream);
        fname_default_stream = talloc_asprintf(tctx, "%s%s", fname_base,
                                               default_stream);