From 7a14f09f9cc14cfb6234175add1841faf751d51a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 26 Sep 2012 03:08:33 +0200 Subject: [PATCH] s4:torture/smb2: remove samba specific stuff from smb2.oplock metze --- source4/torture/smb2/oplock.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c index fc939cc06d8..4cf7c7d72ff 100644 --- a/source4/torture/smb2/oplock.c +++ b/source4/torture/smb2/oplock.c @@ -2416,10 +2416,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"); @@ -2759,12 +2755,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); -- 2.11.4.GIT