s4-smbtorture: skip RAP netservergetinfo level 1 test against s3.
authorGünther Deschner <gd@samba.org>
Fri, 19 Mar 2010 09:54:12 +0000 (10:54 +0100)
committerGünther Deschner <gd@samba.org>
Fri, 19 Mar 2010 09:56:03 +0000 (10:56 +0100)
Guenther

source4/torture/rap/rap.c

index 2660aaf3d401b87e331eaaa9655557ae00713364..78fc6a410dc111180d9e32ff3ef5a9b785481e8e 100644 (file)
@@ -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;
 }