summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-05-11 13:39:37 +0200
committerGünther Deschner <gd@samba.org>2010-05-11 22:52:37 +0200
commitd0a87f0098073b2b7c8b637eccbb9bd91aaa8a80 (patch)
tree859523f025c853dfb1d26995793cfb10e82af1bc
parent1a441113efae9444e643f69980aa8faed540b62e (diff)
downloadsamba-d0a87f0098073b2b7c8b637eccbb9bd91aaa8a80.tar.gz
samba-d0a87f0098073b2b7c8b637eccbb9bd91aaa8a80.tar.bz2
samba-d0a87f0098073b2b7c8b637eccbb9bd91aaa8a80.zip
s4-smbtorture: test netservergetinfo level 1 also against s3.
Guenther
-rw-r--r--source4/torture/rap/rap.c8
-rw-r--r--source4/torture/rap/rpc.c4
2 files changed, 4 insertions, 8 deletions
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 4e490bcaae..74f7188cd5 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 7696ed8e41..4528240310 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,