1
0
mirror of https://github.com/samba-team/samba.git synced 2025-09-17 05:44:20 +03:00

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

metze
This commit is contained in:
Stefan Metzmacher
2012-09-26 03:08:33 +02:00
parent 4604219ceb
commit 7a14f09f9c

View File

@@ -2416,10 +2416,6 @@ static bool test_smb2_oplock_batch22(struct torture_context *tctx,
int timeout = torture_setting_int(tctx, "oplocktimeout", 30); int timeout = torture_setting_int(tctx, "oplocktimeout", 30);
int te; int te;
if (torture_setting_bool(tctx, "samba3", false)) {
torture_skip(tctx, "BATCH22 disabled against samba3\n");
}
status = torture_smb2_testdir(tree1, BASEDIR, &h); status = torture_smb2_testdir(tree1, BASEDIR, &h);
torture_assert_ntstatus_ok(tctx, status, "Error creating directory"); 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}, {&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_stream = talloc_asprintf(tctx, "%s:%s", fname_base, stream);
fname_default_stream = talloc_asprintf(tctx, "%s%s", fname_base, fname_default_stream = talloc_asprintf(tctx, "%s%s", fname_base,
default_stream); default_stream);