s4:torture: Rename rpc.samr.passwords tests

This way it is easier to select them with 'make test'.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index fd168af4a152d845685262188b50cacbc9eca66b..a8f833d52a3c8eee8040d4088b4fc1681d7e407e 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -822,7 +822,7 @@ rpc = ["rpc.authcontext",
        "rpc.samr",
        "rpc.samr.users",
        "rpc.samr.users.privileges",
-       "rpc.samr.passwords",
+       "rpc.samr.passwords.default",
        "rpc.samr.passwords.pwdlastset",
        "rpc.samr.passwords.lockout",
        "rpc.samr.passwords.badpwdcount",

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index d4855b017c630e6738b812a8091d1095cadebd7c..f4c7f19478802ba07c64d552d4bd3dc2906aa9d9 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -197,7 +197,7 @@ slow_ncacn_np_tests = ["rpc.samlogon",
                        "rpc.samr.users",
                        "rpc.samr.large-dc",
                        "rpc.samr.users.privileges",
-                       "rpc.samr.passwords",
+                       "rpc.samr.passwords.default",
                        "rpc.samr.passwords.pwdlastset",
                        "rpc.samr.passwords.lockout",
                        "rpc.samr.passwords.badpwdcount"]
@@ -741,7 +741,7 @@ 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',
+plansmbtorture4testsuite('rpc.samr.passwords.default',
                          "s4member",
                          ['ncacn_np:$NETBIOSNAME',
                           '-U$NETBIOSNAME/$USERNAME%$PASSWORD'],

diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index b172732409b0f515d6a5c483f0d48c1b9972c588..773e564c0475a67896e94f42fb874fff5cf624aa 100644 (file)
--- 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));