diff options
| author | Noel Power <noel.power@suse.com> | 2019-12-19 17:43:10 +0000 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2020-04-03 15:08:33 +0000 |
| commit | ecaaef4ff7ecefbeec58b814c674831cf408a30d (patch) | |
| tree | df40fbbb03ecdeceb3068819e1fa6cd352bc8857 /source3/selftest | |
| parent | 6d67a89a88c14a67f290bfca3d99ba9c84ed45c7 (diff) | |
| download | samba-ecaaef4ff7ecefbeec58b814c674831cf408a30d.tar.gz | |
selftest/knownfail.d knownfail samba3.blackbox.smbclient_auth.plain
samba3.blackbox.smbclient_auth.plain will fail against
ad_member & nt4_member (because these envs don't
support SMB1) so we don't run these tests where either
'LANMAN2' or 'NT1' are in the options, in these cases
to get coverage so we use nt4_dc_smb1
Creating new envs for such a small amount of strictly SMB1 tests anyway
seems overkill. For the moment just create specific knownfail entries
and remove the associated entries from skip_smb1_fail
Signed-off-by: Noel Power <npower@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'source3/selftest')
| -rwxr-xr-x | source3/selftest/tests.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 3609defc8c9..df984531e7c 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -269,7 +269,12 @@ for env in ["nt4_dc", "nt4_member", "ad_member", "ad_dc", "ad_dc_ntvfs", "s4memb plantestsuite("samba3.blackbox.smbclient_ntlm.plain SMB3", env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_ntlm.sh"), '$SERVER', '$DC_USERNAME', '$DC_PASSWORD', "never", smbclient3, "SMB3", configuration]) for options in ["--option=clientntlmv2auth=no", "--option=clientusespnego=no --option=clientntlmv2auth=no", "--option=clientusespnego=no --option=clientntlmv2auth=no -mNT1", ""]: - for env in ["nt4_member", "ad_member"]: + # don't attempt to run SMB1 tests in nt4_member or ad_member + # as these test envs don't support SMB1, use nt4_dc instead + environs = ["nt4_member", "ad_member"] + if "NT1" in options or "LANMAN2" in options: + environs = ["nt4_dc_smb1_done"] + for env in environs: plantestsuite("samba3.blackbox.smbclient_auth.plain.%s" % (options), env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$DC_USERNAME', '$DC_PASSWORD', smbclient3, configuration, options]) plantestsuite("samba3.blackbox.smbclient_auth.plain.%s.member_creds" % (options), env, [os.path.join(samba3srcdir, "script/tests/test_smbclient_auth.sh"), '$SERVER', '$SERVER_IP', '$SERVER/$USERNAME', '$PASSWORD', smbclient3, configuration, options]) |