s4:torture/rpc: don't use the same names for 3 different tests

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>

diff --git a/selftest/knownfail b/selftest/knownfail
index 598fb4d2b5a71bee2d2ad333769ef3058faa3895..3370400e51c3dea11606995df835c050ecd80994 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -233,12 +233,8 @@
 #
 # The Samba4 netlogon server does not implement these LogonControl operations
 #
-^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(ad_dc\)
-^samba3.rpc.netlogon.admin.netlogon.LogonControl\(ad_dc\)
-^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(ad_dc\)
-^samba3.rpc.netlogon.admin.netlogon.LogonControl\(ad_dc\)
-^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(ad_dc\)
-^samba3.rpc.netlogon.admin.netlogon.LogonControl\(ad_dc\)
+^samba3.rpc.netlogon.admin.*.LogonControl2\(ad_dc\)
+^samba3.rpc.netlogon.admin.*.LogonControl\(ad_dc\)
 #
 # The Samba4 winbind does not cover the full winbind protocol, so these are expected
 #

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index dac876ce7069294e0d82d7055545b4ad939466b7..35d7027a512a0eae574ba8f4d74f3d6db803248b 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -4074,19 +4074,19 @@ struct torture_suite *torture_rpc_netlogon_admin(TALLOC_CTX *mem_ctx)
        struct torture_suite *suite = torture_suite_create(mem_ctx, "netlogon.admin");
        struct torture_rpc_tcase *tcase;
 
-       tcase = torture_suite_add_machine_bdc_rpc_iface_tcase(suite, "netlogon",
+       tcase = torture_suite_add_machine_bdc_rpc_iface_tcase(suite, "bdc",
                                                  &ndr_table_netlogon, TEST_MACHINE_NAME);
        torture_rpc_tcase_add_test_creds(tcase, "LogonControl", test_LogonControl);
        torture_rpc_tcase_add_test_creds(tcase, "LogonControl2", test_LogonControl2);
        torture_rpc_tcase_add_test_creds(tcase, "LogonControl2Ex", test_LogonControl2Ex);
 
-       tcase = torture_suite_add_machine_workstation_rpc_iface_tcase(suite, "netlogon",
+       tcase = torture_suite_add_machine_workstation_rpc_iface_tcase(suite, "wkst",
                                                  &ndr_table_netlogon, TEST_MACHINE_NAME);
        torture_rpc_tcase_add_test_creds(tcase, "LogonControl", test_LogonControl);
        torture_rpc_tcase_add_test_creds(tcase, "LogonControl2", test_LogonControl2);
        torture_rpc_tcase_add_test_creds(tcase, "LogonControl2Ex", test_LogonControl2Ex);
 
-       tcase = torture_suite_add_rpc_iface_tcase(suite, "netlogon",
+       tcase = torture_suite_add_rpc_iface_tcase(suite, "admin",
                                                  &ndr_table_netlogon);
        torture_rpc_tcase_add_test_creds(tcase, "LogonControl", test_LogonControl);
        torture_rpc_tcase_add_test_creds(tcase, "LogonControl2", test_LogonControl2);