diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-28 20:42:31 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-28 18:46:23 +0200 |
| commit | 30fd88ed65ee470f366afec4fdd84054edda754f (patch) | |
| tree | 8e1bd7746fda2bed50bcd7b271d38d7f2500551b | |
| parent | 15b9198644613536401a49dd779d4e9be706d980 (diff) | |
| download | samba-30fd88ed65ee470f366afec4fdd84054edda754f.tar.gz samba-30fd88ed65ee470f366afec4fdd84054edda754f.tar.bz2 samba-30fd88ed65ee470f366afec4fdd84054edda754f.zip | |
selftest: use a loop rather than declare tests for both dc and s3dc
| -rwxr-xr-x | source4/selftest/tests.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 7c3409029b..7c31750b6c 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -172,22 +172,22 @@ for t in net_tests: # FIXME: Integrate these into a single smbtorture test transport = "ncacn_np" -for ntlmoptions in [ - "-k no --option=usespnego=yes", - "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no", - "-k no --option=usespnego=yes --option=ntlmssp_client:56bit=yes", - "-k no --option=usespnego=yes --option=ntlmssp_client:56bit=no", - "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=yes", - "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=no", - "-k no --option=usespnego=yes --option=clientntlmv2auth=yes", - "-k no --option=usespnego=yes --option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no", - "-k no --option=usespnego=yes --option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=yes", - "-k no --option=usespnego=no --option=clientntlmv2auth=yes", - "-k no --option=gensec:spnego=no --option=clientntlmv2auth=yes", - "-k no --option=usespnego=no"]: - name = "rpc.lsa.secrets on %s with with %s" % (transport, ntlmoptions) - plansmbtorturetestsuite('rpc.lsa.secrets', "dc", ["%s:$SERVER[]" % (transport), ntlmoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME'], "samba4.%s" % name) - plansmbtorturetestsuite('rpc.lsa.secrets', "s3dc", ["%s:$SERVER[]" % (transport), ntlmoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME'], "samba4.%s" % name) +for env in ["dc", "s3dc"]: + for ntlmoptions in [ + "-k no --option=usespnego=yes", + "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no", + "-k no --option=usespnego=yes --option=ntlmssp_client:56bit=yes", + "-k no --option=usespnego=yes --option=ntlmssp_client:56bit=no", + "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=yes", + "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=no", + "-k no --option=usespnego=yes --option=clientntlmv2auth=yes", + "-k no --option=usespnego=yes --option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no", + "-k no --option=usespnego=yes --option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=yes", + "-k no --option=usespnego=no --option=clientntlmv2auth=yes", + "-k no --option=gensec:spnego=no --option=clientntlmv2auth=yes", + "-k no --option=usespnego=no"]: + name = "rpc.lsa.secrets on %s with with %s" % (transport, ntlmoptions) + plansmbtorturetestsuite('rpc.lsa.secrets', env, ["%s:$SERVER[]" % (transport), ntlmoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME'], "samba4.%s" % name) transports = ["ncacn_np", "ncacn_ip_tcp"] |