From: Andrew Bartlett Date: Sat, 4 Sep 2021 01:11:08 +0000 (+1200) Subject: selftest: Only run samba_tool_drs_showrepl test once X-Git-Tag: ldb-2.5.0~782 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75a5ed66731e947fa16af81aab7649d1fddec45f;p=thirdparty%2Fsamba.git 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 Reviewed-by: Jeremy Allison --- diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 09774587fd9..2dfc21dad7f 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -1377,12 +1377,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,