diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-09-26 03:08:33 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-09-26 06:16:06 +0200 |
| commit | 7a14f09f9cc14cfb6234175add1841faf751d51a (patch) | |
| tree | 3d5929b9bc6d69f25aa12f9c7076e6e2d39e0bcf | |
| parent | 4604219ceba96955b3c4bf6ab31aa70c11442d61 (diff) | |
| download | samba-7a14f09f9cc14cfb6234175add1841faf751d51a.tar.gz samba-7a14f09f9cc14cfb6234175add1841faf751d51a.tar.bz2 samba-7a14f09f9cc14cfb6234175add1841faf751d51a.zip | |
s4:torture/smb2: remove samba specific stuff from smb2.oplock
metze
| -rw-r--r-- | source4/torture/smb2/oplock.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c index fc939cc06d..4cf7c7d72f 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); |