[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Fri Mar 19 03:56:32 MDT 2010
The branch, master has been updated
via 4d6368f... s3-selftest: enable RAP calls testsuite against samba3.
via 3144a98... s4-smbtorture: skip RAP netservergetinfo level 1 test against s3.
from 53d35fc... s3-selftest: rearrange uid/gid calculation to achieve correct membership.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4d6368f5f5b384af7e8d06425357cb1666ac853f
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 19 09:19:39 2010 +0100
s3-selftest: enable RAP calls testsuite against samba3.
Guenther
commit 3144a988e5e95671fd49bd2326099dff789fec5d
Author: Günther Deschner <gd at samba.org>
Date: Fri Mar 19 10:54:12 2010 +0100
s4-smbtorture: skip RAP netservergetinfo level 1 test against s3.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/script/tests/test_posix_s3.sh | 4 +++-
source4/torture/rap/rap.c | 13 +++++++++++--
2 files changed, 14 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index f1b5608..1e95b07 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -54,12 +54,14 @@ local="LOCAL-NSS-WRAPPER LOCAL-NDR"
winbind="WINBIND-STRUCT WINBIND-WBCLIENT"
+rap="RAP-BASIC"
+
# NOTE: to enable the UNIX-WHOAMI test, we need to change the default share
# config to allow guest access. I'm not sure whether this would break other
# tests, so leaving it alone for now -- jpeach
unix="UNIX-INFO2"
-tests="$base $raw $rpc $unix $local $winbind"
+tests="$base $raw $rpc $unix $local $winbind $rap"
if test "x$POSIX_SUBTESTS" != "x" ; then
tests="$POSIX_SUBTESTS"
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 2660aaf..78fc6a4 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;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list