diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2022-03-04 16:57:27 +1300 |
|---|---|---|
| committer | Jule Anger <janger@samba.org> | 2022-07-24 11:42:01 +0200 |
| commit | bff1978187d530164888f2a0c3daa3d6a4ae2245 (patch) | |
| tree | 9fbb56f798470ff21138e8741215eb99f4e5f391 | |
| parent | c0977bee5b8c2f72cb5467e95a6ab034f696eee7 (diff) | |
| download | samba-bff1978187d530164888f2a0c3daa3d6a4ae2245.tar.gz | |
selftest: Simplify krb5 test environments
It's not necessary to repeat the required environment variables for
every test.
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit e729606631b5bfaf7c4ad8c1e70697adf8274777)
[jsutton@samba.org Fixed conflicts caused by missing check_cname,
check_padata and fast_support variables]
[jsutton@samba.org Fixed conflicts]
| -rwxr-xr-x | source4/selftest/tests.py | 191 |
1 files changed, 35 insertions, 156 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 38cb757f993..85a4d5dd3a3 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -827,104 +827,57 @@ planoldpythontestsuite("ad_dc:local", "samba.tests.gpo", extra_args=['-U"$USERNA planoldpythontestsuite("ad_dc:local", "samba.tests.dckeytab", extra_args=['-U"$USERNAME%$PASSWORD"']) have_fast_support = int('SAMBA_USES_MITKDC' in config_hash) +claims_support = 0 +compound_id_support = 0 tkt_sig_support = int('SAMBA4_USES_HEIMDAL' in config_hash) expect_pac = int('SAMBA4_USES_HEIMDAL' in config_hash) extra_pac_buffers = int('SAMBA4_USES_HEIMDAL' in config_hash) +krb5_environ = { + 'SERVICE_USERNAME': '$SERVER', + 'ADMIN_USERNAME': '$DC_USERNAME', + 'ADMIN_PASSWORD': '$DC_PASSWORD', + 'FOR_USER': '$DC_USERNAME', + 'STRICT_CHECKING':'0', + 'FAST_SUPPORT': have_fast_support, + 'CLAIMS_SUPPORT': claims_support, + 'COMPOUND_ID_SUPPORT': compound_id_support, + 'TKT_SIG_SUPPORT': tkt_sig_support, + 'EXPECT_PAC': expect_pac, + 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers, +} planoldpythontestsuite("none", "samba.tests.krb5.kcrypto") planoldpythontestsuite("ad_dc_default", "samba.tests.krb5.simple_tests", - environ={'SERVICE_USERNAME':'$SERVER', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers}) + environ=krb5_environ) planoldpythontestsuite("ad_dc_default:local", "samba.tests.krb5.s4u_tests", - environ={'ADMIN_USERNAME':'$USERNAME', - 'ADMIN_PASSWORD':'$PASSWORD', - 'FOR_USER':'$USERNAME', - 'STRICT_CHECKING':'0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers}) + environ=krb5_environ) planoldpythontestsuite("rodc:local", "samba.tests.krb5.rodc_tests", - environ={'ADMIN_USERNAME':'$USERNAME', - 'ADMIN_PASSWORD':'$PASSWORD', - 'STRICT_CHECKING':'0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers}) + environ=krb5_environ) planoldpythontestsuite("fl2008r2dc:local", "samba.tests.krb5.xrealm_tests", - environ={'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers}) + environ=krb5_environ) planoldpythontestsuite("ad_dc_default", "samba.tests.krb5.test_ccache", - environ={ - 'ADMIN_USERNAME': '$USERNAME', - 'ADMIN_PASSWORD': '$PASSWORD', - 'STRICT_CHECKING': '0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers - }) + environ=krb5_environ) planoldpythontestsuite("ad_dc_default", "samba.tests.krb5.test_ldap", - environ={ - 'ADMIN_USERNAME': '$USERNAME', - 'ADMIN_PASSWORD': '$PASSWORD', - 'STRICT_CHECKING': '0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers - }) + environ=krb5_environ) for env in ['ad_dc_default', 'ad_member']: planoldpythontestsuite(env, "samba.tests.krb5.test_rpc", - environ={ - 'ADMIN_USERNAME': '$DC_USERNAME', - 'ADMIN_PASSWORD': '$DC_PASSWORD', - 'STRICT_CHECKING': '0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers - }) + environ=krb5_environ) planoldpythontestsuite("ad_dc_smb1", "samba.tests.krb5.test_smb", - environ={ - 'ADMIN_USERNAME': '$USERNAME', - 'ADMIN_PASSWORD': '$PASSWORD', - 'STRICT_CHECKING': '0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers - }) + environ=krb5_environ) planoldpythontestsuite("ad_member_idmap_nss:local", "samba.tests.krb5.test_min_domain_uid", - environ={ - 'ADMIN_USERNAME': '$DC_USERNAME', - 'ADMIN_PASSWORD': '$DC_PASSWORD', - 'STRICT_CHECKING': '0' - }) + environ=krb5_environ) planoldpythontestsuite("ad_member_idmap_nss:local", "samba.tests.krb5.test_idmap_nss", environ={ - 'ADMIN_USERNAME': '$DC_USERNAME', - 'ADMIN_PASSWORD': '$DC_PASSWORD', + **krb5_environ, 'MAPPED_USERNAME': 'bob', 'MAPPED_PASSWORD': 'Secret007', 'UNMAPPED_USERNAME': 'jane', 'UNMAPPED_PASSWORD': 'Secret007', 'INVALID_USERNAME': 'joe', 'INVALID_PASSWORD': 'Secret007', - 'STRICT_CHECKING': '0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers }) for env in ["ad_dc", smbv1_disabled_testenv]: @@ -1500,26 +1453,10 @@ plansmbtorture4testsuite('krb5.kdc', env, ['ncacn_np:$SERVER_IP', "-k", "yes", ' "samba4.krb5.kdc with account having identical UPN and SPN") for env in ["fl2008r2dc", "fl2003dc"]: planoldpythontestsuite(env, "samba.tests.krb5.as_req_tests", - environ={ - 'ADMIN_USERNAME': '$USERNAME', - 'ADMIN_PASSWORD': '$PASSWORD', - 'STRICT_CHECKING': '0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers - }) + environ=krb5_environ) planoldpythontestsuite('fl2008r2dc', 'samba.tests.krb5.salt_tests', - environ={ - 'ADMIN_USERNAME': '$USERNAME', - 'ADMIN_PASSWORD': '$PASSWORD', - 'STRICT_CHECKING': '0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers - }) + environ=krb5_environ) for env in ["rodc", "promoted_dc", "fl2000dc", "fl2008r2dc"]: if env == "rodc": @@ -1536,89 +1473,31 @@ for env in ["rodc", "promoted_dc", "fl2000dc", "fl2008r2dc"]: "samba4.krb5.kdc with machine account") planpythontestsuite("ad_dc", "samba.tests.krb5.as_canonicalization_tests", - environ={ - 'ADMIN_USERNAME': '$USERNAME', - 'ADMIN_PASSWORD': '$PASSWORD', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers - }) + environ=krb5_environ) planpythontestsuite("ad_dc", "samba.tests.krb5.compatability_tests", - environ={ - 'ADMIN_USERNAME': '$USERNAME', - 'ADMIN_PASSWORD': '$PASSWORD', - 'STRICT_CHECKING': '0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers - }) + environ=krb5_environ) planpythontestsuite("ad_dc", "samba.tests.krb5.kdc_tests", - environ={'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers}) + environ=krb5_environ) planpythontestsuite( "ad_dc", "samba.tests.krb5.kdc_tgs_tests", - environ={ - 'ADMIN_USERNAME': '$USERNAME', - 'ADMIN_PASSWORD': '$PASSWORD', - 'STRICT_CHECKING': '0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers - }) + environ=krb5_environ) planpythontestsuite( "ad_dc", "samba.tests.krb5.fast_tests", - environ={ - 'ADMIN_USERNAME': '$USERNAME', - 'ADMIN_PASSWORD': '$PASSWORD', - 'STRICT_CHECKING': '0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers - }) + environ=krb5_environ) planpythontestsuite( "ad_dc", "samba.tests.krb5.ms_kile_client_principal_lookup_tests", - environ={ - 'ADMIN_USERNAME': '$USERNAME', - 'ADMIN_PASSWORD': '$PASSWORD', - 'STRICT_CHECKING': '0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers - }) + environ=krb5_environ) planpythontestsuite( "ad_dc", "samba.tests.krb5.spn_tests", - environ={ - 'ADMIN_USERNAME': '$USERNAME', - 'ADMIN_PASSWORD': '$PASSWORD', - 'STRICT_CHECKING': '0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers - }) + environ=krb5_environ) planpythontestsuite( "ad_dc", "samba.tests.krb5.alias_tests", - environ={ - 'ADMIN_USERNAME': '$USERNAME', - 'ADMIN_PASSWORD': '$PASSWORD', - 'STRICT_CHECKING': '0', - 'FAST_SUPPORT': have_fast_support, - 'TKT_SIG_SUPPORT': tkt_sig_support, - 'EXPECT_PAC': expect_pac, - 'EXPECT_EXTRA_PAC_BUFFERS': extra_pac_buffers - }) + environ=krb5_environ) for env in [ 'vampire_dc', |