The branch, master has been updated via bbc5abfa6d2 selftest: Do not skip working tests via 9923d50574c s4:torture: Rename rpc.samr.passwords tests via 3f63393e513 s4:selftest: Reformat rpc.samr.passwords plansmbtorture4testsuite via c7925747dd6 s4:selftest: Reformat slow_ncacn_np_tests list via d692c5a6a3b s3:selftest: Reformat rpc array from 30215a8a211 testprogs: Reformat bogus.sh
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit bbc5abfa6d284ee46eb9e368950714467a2bd3ee Author: Andreas Schneider <a...@samba.org> Date: Fri Jul 15 10:33:55 2022 +0200 selftest: Do not skip working tests Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> Autobuild-User(master): Pavel Filipensky <pfilipen...@samba.org> Autobuild-Date(master): Fri Jul 15 14:24:49 UTC 2022 on sn-devel-184 commit 9923d50574c07764318234ace91ee3bab4a0a7dc Author: Andreas Schneider <a...@samba.org> Date: Fri Jul 15 10:09:02 2022 +0200 s4:torture: Rename rpc.samr.passwords tests This way it is easier to select them with 'make test'. Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit 3f63393e5135f35967e5310d2d2e3dd129dd279c Author: Andreas Schneider <a...@samba.org> Date: Fri Jul 15 10:08:09 2022 +0200 s4:selftest: Reformat rpc.samr.passwords plansmbtorture4testsuite Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit c7925747dd6d33235b050c0a476a24ccf611a990 Author: Andreas Schneider <a...@samba.org> Date: Fri Jul 15 10:06:36 2022 +0200 s4:selftest: Reformat slow_ncacn_np_tests list Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit d692c5a6a3b96b82ac24476c1b033e9c79197b92 Author: Andreas Schneider <a...@samba.org> Date: Fri Jul 15 10:05:44 2022 +0200 s3:selftest: Reformat rpc array Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> ----------------------------------------------------------------------- Summary of changes: selftest/skip | 3 --- source3/selftest/tests.py | 66 ++++++++++++++++++++++++++++++++++++----------- source4/selftest/tests.py | 16 ++++++++++-- source4/torture/rpc/rpc.c | 2 +- 4 files changed, 66 insertions(+), 21 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/skip b/selftest/skip index 0913f20d449..d5cc786f8a5 100644 --- a/selftest/skip +++ b/selftest/skip @@ -82,9 +82,6 @@ ^samba4.smb2.zero-data-ioctl # For manual testing, needs additional parameters. ^samba4.raw.ping.pong # Needs second server to test ^samba4.rpc.samr.accessmask -^samba4.rpc.samr.passwords.*ncacn_np\(ad_dc_ntvfs\) # currently fails, possibly config issue -^samba4.rpc.samr.passwords.*ncacn_np\(ad_dc_slowtests\) # currently fails, possibly config issue -^samba4.rpc.samr.passwords.*s4member # currently fails, possibly config issue ^samba4.raw.scan.eamax ^samba4.smb2.samba3misc ^samba4.smb2.notify diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 5acf89b0be4..a8f833d52a3 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -786,26 +786,62 @@ raw = ["raw.acls", "raw.chkpath", "raw.close", "raw.composite", "raw.context", " smb2 = smbtorture4_testsuites("smb2.") -rpc = ["rpc.authcontext", "rpc.samba3.bind", "rpc.samba3.srvsvc", "rpc.samba3.sharesec", - "rpc.samba3.spoolss", "rpc.samba3.wkssvc", "rpc.samba3.winreg", +rpc = ["rpc.authcontext", + "rpc.samba3.bind", + "rpc.samba3.srvsvc", + "rpc.samba3.sharesec", + "rpc.samba3.spoolss", + "rpc.samba3.wkssvc", + "rpc.samba3.winreg", "rpc.samba3.getaliasmembership-0", - "rpc.samba3.netlogon", "rpc.samba3.sessionkey", "rpc.samba3.getusername", - "rpc.samba3.smb1-pipe-name", "rpc.samba3.smb2-pipe-name", - "rpc.samba3.smb-reauth1", "rpc.samba3.smb-reauth2", - "rpc.samba3.lsa_over_netlogon", "rpc.samba3.pipes_supported_interfaces", - "rpc.svcctl", "rpc.ntsvcs", "rpc.winreg", "rpc.eventlog", - "rpc.spoolss.printserver", "rpc.spoolss.win", "rpc.spoolss.notify", "rpc.spoolss.printer", + "rpc.samba3.netlogon", + "rpc.samba3.sessionkey", + "rpc.samba3.getusername", + "rpc.samba3.smb1-pipe-name", + "rpc.samba3.smb2-pipe-name", + "rpc.samba3.smb-reauth1", + "rpc.samba3.smb-reauth2", + "rpc.samba3.lsa_over_netlogon", + "rpc.samba3.pipes_supported_interfaces", + "rpc.svcctl", + "rpc.ntsvcs", + "rpc.winreg", + "rpc.eventlog", + "rpc.spoolss.printserver", + "rpc.spoolss.win", + "rpc.spoolss.notify", + "rpc.spoolss.printer", "rpc.spoolss.driver", - "rpc.lsa", "rpc.lsa-getuser", "rpc.lsa.lookupsids", "rpc.lsa.lookupnames", - "rpc.lsa.privileges", "rpc.lsa.secrets", + "rpc.lsa", + "rpc.lsa-getuser", + "rpc.lsa.lookupsids", + "rpc.lsa.lookupnames", + "rpc.lsa.privileges", + "rpc.lsa.secrets", "rpc.mdssvc", - "rpc.samr", "rpc.samr.users", "rpc.samr.users.privileges", "rpc.samr.passwords", - "rpc.samr.passwords.pwdlastset", "rpc.samr.passwords.lockout", "rpc.samr.passwords.badpwdcount", "rpc.samr.large-dc", "rpc.samr.machine.auth", - "rpc.samr.priv", "rpc.samr.passwords.validate", "rpc.samr.handletype", + "rpc.samr", + "rpc.samr.users", + "rpc.samr.users.privileges", + "rpc.samr.passwords.default", + "rpc.samr.passwords.pwdlastset", + "rpc.samr.passwords.lockout", + "rpc.samr.passwords.badpwdcount", + "rpc.samr.large-dc", + "rpc.samr.machine.auth", + "rpc.samr.priv", + "rpc.samr.passwords.validate", + "rpc.samr.handletype", "rpc.netlogon.admin", "rpc.netlogon.zerologon", - "rpc.schannel", "rpc.schannel2", "rpc.bench-schannel1", "rpc.schannel_anon_setpw", "rpc.join", "rpc.bind", - "rpc.initshutdown", "rpc.wkssvc", "rpc.srvsvc"] + "rpc.schannel", + "rpc.schannel2", + "rpc.bench-schannel1", + "rpc.schannel_anon_setpw", + "rpc.join", + "rpc.bind", + "rpc.initshutdown", + "rpc.wkssvc", + "rpc.srvsvc"] local = ["local.nss"] diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 070879e6e44..f4c7f194788 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -192,7 +192,15 @@ ncacn_np_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.alt ncalrpc_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.altercontext", "rpc.netlogon", "rpc.netlogon.admin", "rpc.netlogon.zerologon", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext"] drs_rpc_tests = smbtorture4_testsuites("drs.rpc") ncacn_ip_tcp_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.drsuapi", "rpc.drsuapi_w2k8", "rpc.netlogon", "rpc.netlogon.admin", "rpc.netlogon.zerologon", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext", "rpc.samr.passwords.validate"] + 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", "rpc.samr.passwords.lockout", "rpc.samr.passwords.badpwdcount"] +slow_ncacn_np_tests = ["rpc.samlogon", + "rpc.samr", + "rpc.samr.users", + "rpc.samr.large-dc", + "rpc.samr.users.privileges", + "rpc.samr.passwords.default", + "rpc.samr.passwords.pwdlastset", + "rpc.samr.passwords.lockout", + "rpc.samr.passwords.badpwdcount"] slow_ncacn_ip_tcp_tests = ["rpc.cracknames"] all_rpc_tests = ncalrpc_tests + ncacn_np_tests + ncacn_ip_tcp_tests + slow_ncacn_np_tests + slow_ncacn_ip_tcp_tests + ["rpc.lsa.secrets", "rpc.pac", "rpc.samba3-sharesec", "rpc.countcalls"] @@ -733,7 +741,11 @@ plansmbtorture4testsuite('rpc.echo', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$N plansmbtorture4testsuite('rpc.echo', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'], "samba4.rpc.echo against s4member server with domain creds") plansmbtorture4testsuite('rpc.samr', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD'], "samba4.rpc.samr against s4member server with local creds") plansmbtorture4testsuite('rpc.samr.users', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD'], "samba4.rpc.samr.users against s4member server with local creds",) -plansmbtorture4testsuite('rpc.samr.passwords', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD'], "samba4.rpc.samr.passwords against s4member server with local creds") +plansmbtorture4testsuite('rpc.samr.passwords.default', + "s4member", + ['ncacn_np:$NETBIOSNAME', + '-U$NETBIOSNAME/$USERNAME%$PASSWORD'], + "samba4.rpc.samr.passwords.default against s4member server with local creds") plantestsuite("samba4.blackbox.smbclient against s4member server with local creds", "s4member", [os.path.join(samba4srcdir, "client/tests/test_smbclient.sh"), '$NETBIOSNAME', '$USERNAME', '$PASSWORD', '$NETBIOSNAME', '$PREFIX', smbclient4]) # RPC Proxy diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c index b172732409b..773e564c047 100644 --- a/source4/torture/rpc/rpc.c +++ b/source4/torture/rpc/rpc.c @@ -601,7 +601,7 @@ NTSTATUS torture_rpc_init(TALLOC_CTX *ctx) torture_suite_add_suite(suite, torture_rpc_iremotewinspool_drv(suite)); torture_suite_add_simple_test(suite, "samr", torture_rpc_samr); torture_suite_add_simple_test(suite, "samr.users", torture_rpc_samr_users); - torture_suite_add_simple_test(suite, "samr.passwords", torture_rpc_samr_passwords); + torture_suite_add_simple_test(suite, "samr.passwords.default", torture_rpc_samr_passwords); torture_suite_add_suite(suite, torture_rpc_netlogon(suite)); torture_suite_add_suite(suite, torture_rpc_netlogon_s3(suite)); torture_suite_add_suite(suite, torture_rpc_netlogon_admin(suite)); -- Samba Shared Repository