diff options
| author | Aaron Haslett <aaronhaslett@catalyst.net.nz> | 2019-02-12 13:31:57 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2019-04-11 04:17:11 +0000 |
| commit | 350fc49e94525232c3556a3ace108f6e1447a490 (patch) | |
| tree | 4e327b551d8b6eccadc4f6aa54aa1d0b240f32aa /source4 | |
| parent | 4336c058cabd0a11f48ae76dff4e15e85013e783 (diff) | |
| download | samba-350fc49e94525232c3556a3ace108f6e1447a490.tar.gz | |
selftest: tagging tests for new schemaupgrade_dc target
Tagging schema tests against schemaupgrade_dc test target and fixing
some DN assertions to be more generic.
Signed-off-by: Aaron Haslett <aaronhaslett@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/selftest/tests.py | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index db51e97a78e..d5620d5947c 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -675,6 +675,7 @@ planpythontestsuite("ad_dc_default:local", "samba.tests.samba_tool.ou") planpythontestsuite("ad_dc_default:local", "samba.tests.samba_tool.computer") planpythontestsuite("ad_dc_default:local", "samba.tests.samba_tool.forest") planpythontestsuite("ad_dc_default:local", "samba.tests.samba_tool.schema") +planpythontestsuite("schemaupgrade_dc:local", "samba.tests.samba_tool.schema") planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.ntacl") planpythontestsuite("none", "samba.tests.samba_tool.provision_password_check") planpythontestsuite("none", "samba.tests.samba_tool.help") @@ -837,12 +838,14 @@ plantestsuite_loadlist("samba4.tokengroups.ntlm.python(ad_dc_default)", "ad_dc_d plantestsuite("samba4.sam.python(fl2008r2dc)", "fl2008r2dc", [python, os.path.join(samba4srcdir, "dsdb/tests/python/sam.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN']) plantestsuite("samba4.sam.python(ad_dc_default)", "ad_dc_default", [python, os.path.join(samba4srcdir, "dsdb/tests/python/sam.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN']) plantestsuite("samba4.user_account_control.python(ad_dc_default)", "ad_dc_default", [python, os.path.join(samba4srcdir, "dsdb/tests/python/user_account_control.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN']) -planoldpythontestsuite("ad_dc_default:local", "dsdb_schema_info", - extra_path=[os.path.join(samba4srcdir, 'dsdb/tests/python')], - name="samba4.schemaInfo.python(ad_dc_default)", - extra_args=['-U"$DOMAIN/$DC_USERNAME%$DC_PASSWORD"']) -planpythontestsuite("ad_dc_default:local", "samba.tests.dsdb_schema_attributes") +for env in ['ad_dc_default:local', 'schemaupgrade_dc:local']: + planoldpythontestsuite(env, "dsdb_schema_info", + extra_path=[os.path.join(samba4srcdir, 'dsdb/tests/python')], + name="samba4.schemaInfo.python(%s)" % (env), + extra_args=['-U"$DOMAIN/$DC_USERNAME%$DC_PASSWORD"']) + + planpythontestsuite(env, "samba.tests.dsdb_schema_attributes") plantestsuite_loadlist("samba4.urgent_replication.python(ad_dc_ntvfs)", "ad_dc_ntvfs:local", [python, os.path.join(samba4srcdir, "dsdb/tests/python/urgent_replication.py"), '$PREFIX_ABS/ad_dc_ntvfs/private/sam.ldb', '$LOADLIST', '$LISTOPT']) plantestsuite_loadlist("samba4.ldap.dirsync.python(ad_dc_default)", "ad_dc_default", [python, os.path.join(samba4srcdir, "dsdb/tests/python/dirsync.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT']) @@ -906,7 +909,7 @@ planoldpythontestsuite("ad_dc_default", "password_settings", name="samba4.ldap.passwordsettings.python", extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD']) -for env in all_fl_envs: +for env in all_fl_envs + ["schemaupgrade_dc"]: plantestsuite_loadlist("samba4.ldap_schema.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/ldap_schema.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT']) plantestsuite("samba4.ldap.possibleInferiors.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/samdb/ldb_modules/tests/possibleinferiors.py"), "ldap://$SERVER", '-U"$USERNAME%$PASSWORD"', "-W$DOMAIN"]) plantestsuite_loadlist("samba4.ldap.secdesc.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/sec_descriptor.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT']) @@ -1007,6 +1010,13 @@ planoldpythontestsuite(env, "ridalloc_exop", environ={'DC1': "$DC_SERVER", 'DC2': '$SERVER'}, extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD']) +env = 'schemaupgrade_pair_dc' +planoldpythontestsuite("%s:local" % env, "samba_tool_drs", + extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')], + name="samba4.drs.samba_tool_drs.python(%s)" % env, + environ={'DC1': '$DC_SERVER', 'DC2': '$SERVER'}, + extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD']) + for env in ['vampire_dc', 'promoted_dc']: planoldpythontestsuite("%s:local" % env, "samba_tool_drs", extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')], @@ -1155,7 +1165,7 @@ for env in [ planpythontestsuite("ad_dc_default:local", "samba.tests.kcc.kcc_utils") for env in ["simpleserver", "fileserver", "nt4_dc", "ad_dc", "ad_dc_ntvfs", - "ad_member", "offlinebackupdc", "restoredc", "renamedc", "labdc"]: + "ad_member", "offlinebackupdc", "restoredc", "renamedc", "labdc", 'schemaupgrade_pair_dc']: planoldpythontestsuite(env, "netlogonsvc", extra_path=[os.path.join(srcdir(), 'python/samba/tests')], name="samba.tests.netlogonsvc.python(%s)" % env) |