From: Garming Sam Date: Wed, 15 Mar 2017 03:40:16 +0000 (+1300) Subject: selftest/rodc: Do not run in single mode, this causes deadlocks X-Git-Tag: ldb-1.1.31~155 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=29045dad15ebb5e948d63c50d52810f4f00a58f2 selftest/rodc: Do not run in single mode, this causes deadlocks Attempting to 'ls' the file server against a single process AD will get stuck. This also appears as the KDC being busy. Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Autobuild-User(master): Garming Sam Autobuild-Date(master): Wed Jun 7 05:14:17 CEST 2017 on sn-devel-144 --- diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index e4d5efd9ec4..316ef8346d9 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -2475,7 +2475,7 @@ sub setup_rodc($$$) return undef; } - if (not defined($self->check_or_start($env, "single"))) { + if (not defined($self->check_or_start($env, "standard"))) { return undef; } diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index b9cdee9ec55..7c601c35af4 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -742,6 +742,8 @@ for env in ['rodc']: plansmbtorture4testsuite('rpc.echo', "%s:local" % env, ['ncacn_np:$SERVER', "-k", "yes", '-P', '--workgroup=$DOMAIN'], modname="samba4.rpc.echo") plansmbtorture4testsuite('rpc.echo', "%s:local" % env, ['ncacn_np:$SERVER', "-k", "no", '-Utestallowed\ account%$DC_PASSWORD', '--workgroup=$DOMAIN'], modname="samba4.rpc.echo.testallowed") plansmbtorture4testsuite('rpc.echo', "%s:local" % env, ['ncacn_np:$SERVER', "-k", "no", '-Utestdenied%$DC_PASSWORD', '--workgroup=$DOMAIN'], modname="samba4.rpc.echo.testdenied") + plantestsuite("samba4.blackbox.smbclient(%s:local)" % env, "%s:local" % env, [os.path.join(samba4srcdir, "utils/tests/test_smbclient.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', smbclient4]) + planpythontestsuite("rodc:local", "samba.tests.samba_tool.rodc") plantestsuite("samba.blackbox.rpcclient_samlogon", "rodc:local", [os.path.join(samba3srcdir, "script/tests/test_rpcclient_samlogon.sh"),