From 3144a988e5e95671fd49bd2326099dff789fec5d Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 19 Mar 2010 10:54:12 +0100 Subject: s4-smbtorture: skip RAP netservergetinfo level 1 test against s3. Guenther --- source4/torture/rap/rap.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c index 2660aaf3d4..78fc6a410d 100644 --- a/source4/torture/rap/rap.c +++ b/source4/torture/rap/rap.c @@ -510,9 +510,18 @@ static bool test_netservergetinfo(struct torture_context *tctx, r.in.bufsize = 0xffff; r.in.level = 0; - torture_assert_ntstatus_ok(tctx, smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r), ""); + torture_assert_ntstatus_ok(tctx, + smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r), + "rap_netservergetinfo level 0 failed"); + + if (torture_setting_bool(tctx, "samba3", false)) { + torture_skip(tctx, "skipping netservergetinfo level 1 against samba3"); + } + r.in.level = 1; - torture_assert_ntstatus_ok(tctx, smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r), ""); + torture_assert_ntstatus_ok(tctx, + smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r), + "rap_netservergetinfo level 1 failed"); return res; } -- cgit