diff options
| author | Ralph Boehme <slow@samba.org> | 2019-11-26 13:35:29 +0100 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2019-12-20 06:08:40 +0000 |
| commit | 2d2809be7b17afd0a6054e93c9e5491a31356a1d (patch) | |
| tree | 6ddc2d5647dfefa85469abdd51466a21de7c88af /source4 | |
| parent | c20179a4f86bbaad75b0f87376257080760c650b (diff) | |
| download | samba-2d2809be7b17afd0a6054e93c9e5491a31356a1d.tar.gz | |
selftest: make testenv name logic more flexible for the rpc testcases
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/selftest/tests.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 132d3aac102..81cf7e6e5c9 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -192,9 +192,10 @@ auto_rpc_tests = list(filter(lambda t: t not in all_rpc_tests, rpc_tests)) for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]: for transport in ["ncalrpc", "ncacn_np", "ncacn_ip_tcp"]: env = "ad_dc_default" + local = "" if transport == "ncalrpc": tests = ncalrpc_tests - env = "ad_dc_default:local" + local = ":local" elif transport == "ncacn_np": tests = ncacn_np_tests elif transport == "ncacn_ip_tcp": @@ -202,8 +203,8 @@ for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]: else: raise AssertionError("invalid transport %r" % transport) for t in tests: - plansmbtorture4testsuite(t, env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s on %s with %s" % (t, transport, bindoptions)) - plansmbtorture4testsuite('rpc.samba3-sharesec', env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=torture:share=tmp'], "samba4.rpc.samba3.sharesec on %s with %s" % (transport, bindoptions)) + plansmbtorture4testsuite(t, env + local, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s on %s with %s" % (t, transport, bindoptions)) + plansmbtorture4testsuite('rpc.samba3-sharesec', env + local, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=torture:share=tmp'], "samba4.rpc.samba3.sharesec on %s with %s" % (transport, bindoptions)) # Plugin S4 DC tests (confirms named pipe auth forwarding). This can be expanded once kerberos is supported in the plugin DC # |