diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2021-09-04 12:28:20 +1200 |
|---|---|---|
| committer | Jule Anger <janger@samba.org> | 2021-09-08 12:32:11 +0000 |
| commit | 8c246869e142a8115a6428285d582f0e123a38ff (patch) | |
| tree | 3c1334abfb2d4b6bcb6b6680c3dcbfdaaedf5303 | |
| parent | 5cec6963b697b14177f06fd09c95741810d9d25f (diff) | |
| download | samba-8c246869e142a8115a6428285d582f0e123a38ff.tar.gz | |
selftest: Split up targets for samba_tool_drs from samba_tool_drs_showrepl
These now run in the disconnected sets schema_dc/schema_pair_dc and
ad_dc/vampire_dc/promoted_dc. By aiming at different sets ofservers
we can't cause cross-contamination in terms of which servers are
listed as outbound connections.
Also, by running the tests only once we reduce the chaces of trouble
by half.
RN: Address flapping samba_tool_drs_showrepl test
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14818
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit e8b4599e0935290c5e59df9fd4f695ad8d6f361c)
| -rwxr-xr-x | source4/selftest/tests.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index aed0fb36dc5..7a674698cc4 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -1295,6 +1295,18 @@ planoldpythontestsuite(env, "ridalloc_exop", environ={'DC1': "$DC_SERVER", 'DC2': '$SERVER'}, extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD']) +# This test can pollute the environment a little by creating and +# deleting DCs which can get into the replication state for a while. +# +# The setting of DC1 to $DC_SERVER means that it will join towards and +# operate on schema_dc. This matters most when running +# test_samba_tool_replicate_local as this sets up a full temp DC and +# does new replication to it, which can show up in the replication +# topology. +# +# That is why this test is run on the isolated environment and not on +# those connected with ad_dc (vampiredc/promoteddc) + env = 'schema_pair_dc' planoldpythontestsuite("%s:local" % env, "samba_tool_drs", extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')], @@ -1309,11 +1321,6 @@ planoldpythontestsuite(env, "getnc_schema", 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')], - name="samba4.drs.samba_tool_drs.python(%s)" % env, - environ={'DC1': '$DC_SERVER', 'DC2': '$SERVER'}, - extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD']) planoldpythontestsuite("%s:local" % env, "samba_tool_drs_showrepl", extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')], name="samba4.drs.samba_tool_drs_showrepl.python(%s)" % env, |