From f8bb5a60e71bd51971ef05a23037cac4523dee25 Mon Sep 17 00:00:00 2001 From: Tim Prouty Date: Wed, 16 Dec 2009 14:31:54 -0800 Subject: s4 torture: Parameterize streams delete behavior rather than commenting out the check. --- source4/torture/raw/streams.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source4') diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c index 6b41031fcb..8fb7c0b3bb 100644 --- a/source4/torture/raw/streams.c +++ b/source4/torture/raw/streams.c @@ -607,9 +607,13 @@ static bool test_stream_delete(struct torture_context *tctx, status = smb_raw_fileinfo(cli->tree, tctx, &finfo); CHECK_STATUS(status, NT_STATUS_OK); - /* w2k and w2k3 return 0 and w2k8 returns 1 - CHECK_VALUE(finfo.all_info.out.delete_pending, 0); - */ + + /* w2k and w2k3 return 0 and w2k8 returns 1 */ + if (TARGET_IS_WINXP(tctx) || TARGET_IS_W2K3(tctx)) { + CHECK_VALUE(finfo.all_info.out.delete_pending, 0); + } else { + CHECK_VALUE(finfo.all_info.out.delete_pending, 1); + } smbcli_close(cli->tree, fnum); -- cgit