From: Günther Deschner <gd@samba.org>
Date: Tue, 11 May 2010 11:39:37 +0000 (+0200)
Subject: s4-smbtorture: test netservergetinfo level 1 also against s3.
X-Git-Tag: samba-3.6.0pre1~2083
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0a87f0098073b2b7c8b637eccbb9bd91aaa8a80;p=thirdparty%2Fsamba.git

s4-smbtorture: test netservergetinfo level 1 also against s3.

Guenther
---

diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 4e490bcaae5..74f7188cd53 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -1720,15 +1720,15 @@ static bool test_netservergetinfo(struct torture_context *tctx,
 	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");
-	}
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"rap_netservergetinfo level 0 failed");
 
 	r.in.level = 1;
 	torture_assert_ntstatus_ok(tctx,
 		smbcli_rap_netservergetinfo(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r),
 		"rap_netservergetinfo level 1 failed");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"rap_netservergetinfo level 1 failed");
 
 	return res;
 }
diff --git a/source4/torture/rap/rpc.c b/source4/torture/rap/rpc.c
index 7696ed8e41e..4528240310c 100644
--- a/source4/torture/rap/rpc.c
+++ b/source4/torture/rap/rpc.c
@@ -67,10 +67,6 @@ static bool test_rpc_netservergetinfo(struct torture_context *tctx,
 
 	torture_assert_str_equal(tctx, (const char *)r.out.info.info0.name, server_name, "server name");
 
-	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,