The branch, master has been updated
via 887b730... s4-test: Add drs.rpc.msDSIntId test to knownfail tests
via 776a3cd... s4-test: Run all DRS-RPC.* tests in ncacn_ip_tcp_tests
tests group
via e58aed2... s4-drs-test: Make the two DRS test suite a top-level
test suites
from d6ccd4c... s4:ldap_backend.c - fix a DS error code after WERROR
change
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 887b7306a779509d9929d18d0ca91b17d510fd5b
Author: Kamen Mazdrashki <kame...@samba.org>
Date: Wed Aug 11 01:54:05 2010 +0300
s4-test: Add drs.rpc.msDSIntId test to knownfail tests
commit 776a3cdc08cb6220656c3b4b7f782d87677e29c0
Author: Kamen Mazdrashki <kame...@samba.org>
Date: Fri Aug 13 23:42:34 2010 +0300
s4-test: Run all DRS-RPC.* tests in ncacn_ip_tcp_tests tests group
Andrew, please check.
commit e58aed25fcc2a4f4ed5b4c167fc8f954c5d471f5
Author: Kamen Mazdrashki <kame...@samba.org>
Date: Fri Aug 13 22:30:39 2010 +0300
s4-drs-test: Make the two DRS test suite a top-level test suites
so that test cases gets visible with "smbtorture --list"
-----------------------------------------------------------------------
Summary of changes:
source4/selftest/knownfail | 1 +
source4/selftest/tests.sh | 6 +++---
source4/torture/drs/drs_init.c | 37 +++++++++++++++++++++----------------
3 files changed, 25 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index 674501f..1b0fce7 100644
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -78,3 +78,4 @@ samba4.smb2.acls.*.OWNER
samba4.smb2.compound.*.RELATED1
samba4.smb2.compound.*.RELATED2
samba4.smb2.compound.*.INVALID2
+samba4.drs.rpc.msdsintid # not working yet
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index bc4543c..b34eb02 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -166,7 +166,8 @@ fi
# that they stay passing
ncacn_np_tests="RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP RPC-ALTERCONTEXT
RPC-MULTIBIND RPC-NETLOGON RPC-HANDLES RPC-SAMSYNC RPC-SAMBA3-SESSIONKEY
RPC-SAMBA3-GETUSERNAME RPC-SAMBA3-LSA RPC-SAMBA3-BIND RPC-SAMBA3-NETLOGON
RPC-ASYNCBIND RPC-LSALOOKUP RPC-LSA-GETUSER RPC-SCHANNEL2 RPC-AUTHCONTEXT"
ncalrpc_tests="RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP RPC-ALTERCONTEXT
RPC-MULTIBIND RPC-NETLOGON RPC-DRSUAPI RPC-ASYNCBIND RPC-LSALOOKUP
RPC-LSA-GETUSER RPC-SCHANNEL2 RPC-AUTHCONTEXT"
-ncacn_ip_tcp_tests="RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP RPC-ALTERCONTEXT
RPC-MULTIBIND RPC-NETLOGON RPC-HANDLES RPC-ASYNCBIND RPC-LSALOOKUP
RPC-LSA-GETUSER RPC-SCHANNEL2 RPC-AUTHCONTEXT RPC-OBJECTUUID DRS-RPC-DSSYNC"
+drs_rpc_tests=`$smb4torture --list | grep '^DRS-RPC'`
+ncacn_ip_tcp_tests="RPC-SCHANNEL RPC-JOIN RPC-LSA RPC-DSSETUP RPC-ALTERCONTEXT
RPC-MULTIBIND RPC-NETLOGON RPC-HANDLES RPC-ASYNCBIND RPC-LSALOOKUP
RPC-LSA-GETUSER RPC-SCHANNEL2 RPC-AUTHCONTEXT RPC-OBJECTUUID $drs_rpc_tests"
slow_ncacn_np_tests="RPC-SAMLOGON RPC-SAMR RPC-SAMR-USERS RPC-SAMR-LARGE-DC
RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS RPC-SAMR-PASSWORDS-PWDLASTSET"
slow_ncalrpc_tests="RPC-SAMR RPC-SAMR-PASSWORDS"
slow_ncacn_ip_tcp_tests="RPC-SAMR RPC-SAMR-PASSWORDS RPC-CRACKNAMES"
@@ -175,8 +176,7 @@ all_tests="$ncalrpc_tests $ncacn_np_tests
$ncacn_ip_tcp_tests $slow_ncalrpc_test
# Make sure all tests get run
rpc_tests=`$smb4torture --list | grep '^RPC-'`
-drs_rpc_tests=`$smb4torture --list | grep '^DRS-RPC'`
-rpc_tests_list="${rpc_tests} ${drs_rpc_tests}"
+rpc_tests_list="${rpc_tests}"
for t in $rpc_tests_list
do
echo $all_tests | grep "$t" > /dev/null
diff --git a/source4/torture/drs/drs_init.c b/source4/torture/drs/drs_init.c
index 6c1f1a0..e6b1d61 100644
--- a/source4/torture/drs/drs_init.c
+++ b/source4/torture/drs/drs_init.c
@@ -28,30 +28,34 @@
/**
* DRSUAPI tests to be executed remotely
*/
-static struct torture_suite * torture_drs_rpc_suite(TALLOC_CTX *mem_ctx)
+static struct torture_suite * torture_drs_rpc_suite(TALLOC_CTX *mem_ctx,
+ const char *suite_name)
{
- struct torture_suite *suite = torture_suite_create(
- talloc_autofree_context(),
- "RPC");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, suite_name);
torture_drs_rpc_dssync_tcase(suite);
torture_drs_rpc_dsintid_tcase(suite);
+ suite->description = talloc_strdup(suite,
+ "DRSUAPI RPC Tests Suite");
+
return suite;
}
/**
* DRSUAPI tests to be executed remotely
*/
-static struct torture_suite * torture_drs_unit_suite(TALLOC_CTX *mem_ctx)
+static struct torture_suite * torture_drs_unit_suite(TALLOC_CTX *mem_ctx,
+ const char *suite_name)
{
- struct torture_suite *suite = torture_suite_create(
- talloc_autofree_context(),
- "UNIT");
+ struct torture_suite *suite = torture_suite_create(mem_ctx, suite_name);
torture_drs_unit_prefixmap(suite);
torture_drs_unit_schemainfo(suite);
+ suite->description = talloc_strdup(suite,
+ "DRSUAPI Unit Tests Suite");
+
return suite;
}
@@ -60,16 +64,17 @@ static struct torture_suite *
torture_drs_unit_suite(TALLOC_CTX *mem_ctx)
*/
NTSTATUS torture_drs_init(void)
{
- struct torture_suite *suite = torture_suite_create(
- talloc_autofree_context(),
- "DRS");
+ struct torture_suite *suite;
+ TALLOC_CTX *mem_ctx = talloc_autofree_context();
- torture_suite_add_suite(suite, torture_drs_rpc_suite(suite));
- torture_suite_add_suite(suite, torture_drs_unit_suite(suite));
-
- suite->description = talloc_strdup(suite,
- "DRSUAPI related tests - Remote and
Local");
+ /* register RPC related test cases */
+ suite = torture_drs_rpc_suite(mem_ctx, "DRS-RPC");
+ if (!suite) return NT_STATUS_NO_MEMORY;
+ torture_register_suite(suite);
+ /* register DRS Unit test cases */
+ suite = torture_drs_unit_suite(mem_ctx, "DRS-UNIT");
+ if (!suite) return NT_STATUS_NO_MEMORY;
torture_register_suite(suite);
return NT_STATUS_OK;
--
Samba Shared Repository
