diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2021-09-04 13:11:08 +1200 |
|---|---|---|
| committer | Jule Anger <janger@samba.org> | 2021-09-08 12:32:11 +0000 |
| commit | d18232cdcfc48ed7b03e831bb28ff57140fe5f9a (patch) | |
| tree | 85ba980403f8fa44f1e5c7733ed42cbfebf1ecc3 | |
| parent | 8c246869e142a8115a6428285d582f0e123a38ff (diff) | |
| download | samba-d18232cdcfc48ed7b03e831bb28ff57140fe5f9a.tar.gz | |
selftest: Only run samba_tool_drs_showrepl test once
This test is not slow, but there is no value running it twice.
Running this test twice just increases the chances we might
loose a race as it shows and validates live replication data.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 75a5ed66731e947fa16af81aab7649d1fddec45f)
| -rwxr-xr-x | source4/selftest/tests.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 7a674698cc4..351430da1a4 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -1320,12 +1320,18 @@ planoldpythontestsuite(env, "getnc_schema", "PLEASE_BREAK_MY_WINDOWS": "1"}, extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD']) +# This test can be sensitive to the DC joins and replications don in +# "samba_tool_drs" so run this is run against scheam_pair_dc/schema_dc +# not the set of environments connected with ad_dc. + +# This will show the replication state of ad_dc +planoldpythontestsuite("promoted_dc:local", "samba_tool_drs_showrepl", + extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')], + name="samba4.drs.samba_tool_drs_showrepl.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_showrepl", - extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')], - name="samba4.drs.samba_tool_drs_showrepl.python(%s)" % env, - environ={'DC1': '$DC_SERVER', 'DC2': '$SERVER'}, - extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD']) planoldpythontestsuite("%s:local" % env, "replica_sync", extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')], name="samba4.drs.replica_sync.python(%s)" % env, |