From 66bf780e6edac110b85d2a0d08d01274fe7417bd Mon Sep 17 00:00:00 2001 From: Tim Prouty Date: Wed, 25 Nov 2009 14:40:54 -0800 Subject: s4 torture: Change RAW-SFILEINFO-END-OF-FILE to check for share modes by default Since the windows behavior appears to be a bug, only check for the windows-style share mode bug if target= is specified --- source4/torture/raw/setfileinfo.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'source4/torture/raw/setfileinfo.c') diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c index 0aa1f38c83..95fb9d7e06 100644 --- a/source4/torture/raw/setfileinfo.c +++ b/source4/torture/raw/setfileinfo.c @@ -772,17 +772,15 @@ torture_raw_sfileinfo_eof(struct torture_context *tctx, struct smbcli_state *cli * Looks like a windows bug: * http://lists.samba.org/archive/cifs-protocol/2009-November/001130.html */ - if (torture_setting_bool(tctx, "samba3", false) || - torture_setting_bool(tctx, "samba4", false) || - torture_setting_bool(tctx, "onefs", false)) { + if (TARGET_IS_W2K8(tctx) || TARGET_IS_WIN7(tctx)) { + /* It succeeds! This is just weird! */ + torture_assert_ntstatus_equal_goto(tctx, status, NT_STATUS_OK, ret, + done, "Status should be OK"); + } else { torture_assert_ntstatus_equal_goto(tctx, status, NT_STATUS_SHARING_VIOLATION, ret, done, "Status should be " "SHARING_VIOLATION"); goto done; - } else { - /* It succeeds! This is just weird! */ - torture_assert_ntstatus_equal_goto(tctx, status, NT_STATUS_OK, ret, - done, "Status should be OK"); } /* Verify that the file was actually extended to 100. */ -- cgit