The branch, master has been updated
via f011723 Fix default value for subunitrun --list.
via 042f3fe selftesthelpers: Revert perl changes, add comment on why
the original code was necessary.
via 5cf31eb s4-tests: Use plansmbtorturesuite where possible.
via faa4eb5 s4-tests: Remove unnecessary py suffix.
via 6321d5b s4-tests: Allow listing tests run for iconv.
via 11a77fe subunitrun: Don't load smb.conf when just listing tests.
via f625d36 Remove broken code - these lines use undefined symbols.
via 03759fe waf: Fix uselib_store for system libsubunit.
via 3849599 selftesthelpers: Cope with empty binary mappings list,
simplify handling of perl.
from 17c529a s4:selftest: samba4.urgent_replication.python needs to run
as "dc:local"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f0117237fa7446bfd0ff8dbcba4e6625f44a397a
Author: Jelmer Vernooij <[email protected]>
Date: Mon Nov 14 14:55:49 2011 +0100
Fix default value for subunitrun --list.
Autobuild-User: Jelmer Vernooij <[email protected]>
Autobuild-Date: Mon Nov 14 17:27:03 CET 2011 on sn-devel-104
commit 042f3fe5f6f1b93d282d421dee08cc4e2e1aaf19
Author: Jelmer Vernooij <[email protected]>
Date: Mon Nov 14 13:47:50 2011 +0100
selftesthelpers: Revert perl changes, add comment on why the original code
was necessary.
commit 5cf31eb5927f76136182e295f8267c906aac8d78
Author: Jelmer Vernooij <[email protected]>
Date: Mon Nov 14 13:10:11 2011 +0100
s4-tests: Use plansmbtorturesuite where possible.
commit faa4eb5d1a2f270204a413b1ca94f9b8991df622
Author: Jelmer Vernooij <[email protected]>
Date: Mon Nov 14 01:54:43 2011 +0100
s4-tests: Remove unnecessary py suffix.
commit 6321d5bf9764929c7bb8c39f7461759776b7739a
Author: Jelmer Vernooij <[email protected]>
Date: Mon Nov 14 01:54:26 2011 +0100
s4-tests: Allow listing tests run for iconv.
commit 11a77fe2d7b9ff3edd2e095acff8fdad03b35b50
Author: Jelmer Vernooij <[email protected]>
Date: Mon Nov 14 01:13:36 2011 +0100
subunitrun: Don't load smb.conf when just listing tests.
commit f625d362d7284c824edeffb58059ecb8114558db
Author: Jelmer Vernooij <[email protected]>
Date: Sun Nov 13 22:33:41 2011 +0100
Remove broken code - these lines use undefined symbols.
commit 03759fe0223771df9cb77a3391468c0b64d36410
Author: Jelmer Vernooij <[email protected]>
Date: Sun Nov 13 22:15:49 2011 +0100
waf: Fix uselib_store for system libsubunit.
commit 38495995c924ce4339a0f4982e1a87ce8bcfe640
Author: Jelmer Vernooij <[email protected]>
Date: Sun Nov 13 21:51:53 2011 +0100
selftesthelpers: Cope with empty binary mappings list, simplify handling of
perl.
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_bundled.py | 2 +-
selftest/selftesthelpers.py | 13 ++--
source4/dsdb/tests/python/token_group.py | 9 +--
source4/scripting/bin/subunitrun | 7 +-
source4/selftest/tests.py | 103 +++++++++++++++---------------
5 files changed, 67 insertions(+), 67 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_bundled.py
b/buildtools/wafsamba/samba_bundled.py
index 95d0c7d..a29b3aa 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -127,7 +127,7 @@ def CHECK_BUNDLED_SYSTEM_PKG(conf, libname,
minversion='0.0.0',
if conf.check_cfg(package=pkg,
args='"%s >= %s" --cflags --libs' % (pkg, minversion),
- msg=msg):
+ msg=msg, uselib_store=libname.upper()):
conf.SET_TARGET_TYPE(libname, 'SYSLIB')
conf.env[found] = True
if implied_deps:
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index c2f4348..0cfcb69 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -40,11 +40,14 @@ def binpath(name):
binary_mapping_string = os.getenv("BINARY_MAPPING", None)
if binary_mapping_string is not None:
for binmapping_entry in binary_mapping_string.split(','):
- binmapping = binmapping_entry.split(':')
- binary_mapping[binmapping[0]] = binmapping[1]
-
-perl = os.getenv("PERL", "perl")
-perl = perl.split()
+ try:
+ (from_path, to_path) = binmapping_entry.split(':', 1)
+ except ValueError:
+ continue
+ binary_mapping[from_path] = to_path
+
+# Split perl variable to allow $PERL to be set to e.g. "perl -W"
+perl = os.getenv("PERL", "perl").split()
if subprocess.call(perl + ["-e", "eval require Test::More;"]) == 0:
has_perl_test_more = True
diff --git a/source4/dsdb/tests/python/token_group.py
b/source4/dsdb/tests/python/token_group.py
index fb7654e..ff9f3ec 100755
--- a/source4/dsdb/tests/python/token_group.py
+++ b/source4/dsdb/tests/python/token_group.py
@@ -17,7 +17,7 @@ from samba.auth import system_session
from samba import ldb
from samba.samdb import SamDB
from samba.auth import AuthContext
-from samba.ndr import ndr_pack, ndr_unpack
+from samba.ndr import ndr_unpack
from samba import gensec
from samba.credentials import Credentials
@@ -25,7 +25,6 @@ from subunit.run import SubunitTestRunner
import unittest
import samba.tests
-from samba.dcerpc import security
from samba.auth import AUTH_SESSION_INFO_DEFAULT_GROUPS,
AUTH_SESSION_INFO_AUTHENTICATED, AUTH_SESSION_INFO_SIMPLE_PRIVILEGES
@@ -88,7 +87,7 @@ class TokenTest(samba.tests.TestCase):
if len(sidset1.difference(sidset2)):
print("token sids don't match")
print("tokengroups: %s" % tokengroups)
- print("calculated : %s" % self.user_sids);
+ print("calculated : %s" % self.user_sids)
print("difference : %s" % sidset1.difference(sidset2))
self.fail(msg="calculated groups don't match against rootDSE
tokenGroups")
@@ -105,8 +104,6 @@ class TokenTest(samba.tests.TestCase):
sidset2 = set(self.user_sids)
if len(sidset1.difference(sidset2)):
print("token sids don't match")
- print("tokengroups: %s" % tokengroups)
- print("calculated : %s" % sids);
print("difference : %s" % sidset1.difference(sidset2))
self.fail(msg="calculated groups don't match against user DN
tokenGroups")
@@ -155,8 +152,6 @@ class TokenTest(samba.tests.TestCase):
sidset2 = set(self.user_sids)
if len(sidset1.difference(sidset2)):
print("token sids don't match")
- print("tokengroups: %s" % tokengroups)
- print("calculated : %s" % sids);
print("difference : %s" % sidset1.difference(sidset2))
self.fail(msg="calculated groups don't match against user PAC
tokenGroups")
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index dd4290d..df46b08 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -10,7 +10,7 @@
# get e.g. credentials passed via command-line options to this
# script.
-# Copyright (C) Jelmer Vernooij <[email protected]> 2007
+# Copyright (C) Jelmer Vernooij <[email protected]> 2007-2011
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -79,10 +79,11 @@ else:
opts, args = parser.parse_args()
-lp = sambaopts.get_loadparm()
-samba.tests.cmdline_credentials = credopts.get_credentials(lp)
if getattr(opts, "listtests", False):
args.insert(0, "--list")
+else:
+ lp = sambaopts.get_loadparm()
+ samba.tests.cmdline_credentials = credopts.get_credentials(lp)
runner = SubunitTestRunner()
program = TestProgram(module=None, argv=[sys.argv[0]] + args,
testRunner=runner)
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 0a1ff7a..0c755d1 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -33,8 +33,11 @@ if validate:
else:
validate_list = []
-def plansmbtorturetestsuite(name, env, options):
- modname = "samba4.%s" % name
+def plansmbtorturetestsuite(name, env, options, modname=None):
+ if modname is None:
+ modname = "samba4.%s" % name
+ if isinstance(options, list):
+ options = " ".join(options)
cmdline = "%s $LISTOPT %s %s" % (valgrindify(smb4torture), options, name)
plantestsuite_loadlist(modname, env, cmdline)
@@ -129,8 +132,8 @@ for bindoptions in ["seal,padcheck"] + validate_list +
["bigendian"]:
elif transport == "ncacn_ip_tcp":
tests = ncacn_ip_tcp_tests
for t in tests:
- plantestsuite_loadlist("samba4.%s on %s with %s" % (t, transport,
bindoptions), env, [valgrindify(smb4torture), "$LISTOPT", "%s:$SERVER[%s]" %
(transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
- plantestsuite_loadlist("samba4.rpc.samba3.sharesec on %s with %s" %
(transport, bindoptions), env, [valgrindify(smb4torture), "$LISTOPT",
"%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W',
'$DOMAIN', '--option=torture:share=tmp', 'rpc.samba3-sharesec'])
+ plansmbtorturetestsuite(t, env, ["%s:$SERVER[%s]" % (transport,
bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN'], "samba4.%s on %s with
%s" % (t, transport, bindoptions))
+ plansmbtorturetestsuite('rpc.samba3-sharesec', env, ["%s:$SERVER[%s]"
% (transport, bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN',
'--option=torture:share=tmp'], "samba4.rpc.samba3.sharesec on %s with %s" %
(transport, bindoptions))
#Plugin S4 DC tests (confirms named pipe auth forwarding). This can be
expanded once kerberos is supported in the plugin DC
#
@@ -139,14 +142,14 @@ if have_ads_support:
for t in ncacn_np_tests:
env = "plugin_s4_dc"
transport = "ncacn_np"
- plantestsuite_loadlist("samba4.%s with %s" % (t, bindoptions),
env, [valgrindify(smb4torture), "$LISTOPT", "%s:$SERVER[%s]" % (transport,
bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '-k', 'no', t])
+ plansmbtorturetestsuite(t, env, ["%s:$SERVER[%s]" % (transport,
bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', '-k', 'no'], "samba4.%s
with %s" % (t, bindoptions))
for bindoptions in [""] + validate_list + ["bigendian"]:
for t in auto_rpc_tests:
- plantestsuite_loadlist("samba4.%s with %s" % (t, bindoptions), "dc",
[valgrindify(smb4torture), "$LISTOPT", "$SERVER[%s]" % bindoptions,
'-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
+ plansmbtorturetestsuite(t, "dc", ["$SERVER[%s]" % bindoptions,
'-U$USERNAME%$PASSWORD', '-W', '$DOMAIN'], "samba4.%s with %s" % (t,
bindoptions))
t = "rpc.countcalls"
-plantestsuite_loadlist("samba4.%s" % t, "dc:local", [valgrindify(smb4torture),
"$LISTOPT", "$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '-W',
'$DOMAIN', t])
+plansmbtorturetestsuite(t, "dc:local", ["$SERVER[%s]" % bindoptions,
'-U$USERNAME%$PASSWORD', '-W', '$DOMAIN'], modname="samba4.%s" % t)
for transport in ["ncacn_np", "ncacn_ip_tcp"]:
env = "dc"
@@ -155,7 +158,7 @@ for transport in ["ncacn_np", "ncacn_ip_tcp"]:
elif transport == "ncacn_ip_tcp":
tests = slow_ncacn_ip_tcp_tests
for t in tests:
- plantestsuite_loadlist("samba4.%s on %s" % (t, transport), env,
[valgrindify(smb4torture), "$LISTOPT", "%s:$SERVER" % transport,
'-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
+ plansmbtorturetestsuite(t, env, ["%s:$SERVER" % transport,
'-U$USERNAME%$PASSWORD', '-W', '$DOMAIN'], "samba4.%s on %s" % (t, transport))
# Tests for the DFS referral calls implementation
for t in smb4torture_testsuites("dfs."):
@@ -185,30 +188,29 @@ for ntlmoptions in [
"-k no --option=gensec:spnego=no --option=clientntlmv2auth=yes",
"-k no --option=usespnego=no"]:
name = "rpc.lsa.secrets on %s with with %s" % (transport, ntlmoptions)
- plantestsuite_loadlist("samba4.%s" % name, "dc", [smb4torture, "$LISTOPT",
"%s:$SERVER[]" % (transport), ntlmoptions, '-U$USERNAME%$PASSWORD', '-W',
'$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME', 'rpc.lsa.secrets'])
+ plansmbtorturetestsuite('rpc.lsa.secrets', "dc", ["%s:$SERVER[]" %
(transport), ntlmoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN',
'--option=gensec:target_hostname=$NETBIOSNAME'], "samba4.%s" % name)
transports = ["ncacn_np", "ncacn_ip_tcp"]
#Kerberos varies between functional levels, so it is important to check this
on all of them
for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
transport = "ncacn_np"
- plantestsuite_loadlist("samba4.rpc.pac on %s" % (transport,), env,
[smb4torture, "$LISTOPT", "%s:$SERVER[]" % (transport, ),
'-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.pac'])
+ plansmbtorturetestsuite('rpc.pac', env, ["%s:$SERVER[]" % (transport, ),
'-U$USERNAME%$PASSWORD', '-W', '$DOMAIN'], "samba4.rpc.pac on %s" %
(transport,))
for transport in transports:
- plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos" %
(transport,), env, [smb4torture, "$LISTOPT", "%s:$SERVER[]" % (transport, ),
'-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN',
'--option=gensec:target_hostname=$NETBIOSNAME', 'rpc.lsa.secrets'])
- plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos -
use target principal" % (transport,), env, [smb4torture, "$LISTOPT",
"%s:$SERVER[]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W',
'$DOMAIN', "--option=clientusespnegoprincipal=yes",
'--option=gensec:target_hostname=$NETBIOSNAME', 'rpc.lsa.secrets'])
- plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos -
use Samba3 style login" % transport, env, [smb4torture, "$LISTOPT",
"%s:$SERVER" % transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W',
'$DOMAIN', "--option=gensec:fake_gssapi_krb5=yes",
'--option=gensec:gssapi_krb5=no',
'--option=gensec:target_hostname=$NETBIOSNAME', "rpc.lsa.secrets.none*"])
- plantestsuite_loadlist("samba4.rpc.lsa.secrets on %s with Kerberos -
use Samba3 style login, use target principal" % transport, env, [smb4torture,
"$LISTOPT", "%s:$SERVER" % transport, '-k', 'yes', '-U$USERNAME%$PASSWORD',
'-W', '$DOMAIN', "--option=clientusespnegoprincipal=yes",
'--option=gensec:fake_gssapi_krb5=yes', '--option=gensec:gssapi_krb5=no',
'--option=gensec:target_hostname=$NETBIOSNAME', "rpc.lsa.secrets.none*"])
- plantestsuite_loadlist("samba4.rpc.echo on %s" % (transport, ), env,
[smb4torture, "$LISTOPT", "%s:$SERVER[]" % (transport,),
'-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.echo'])
+ plansmbtorturetestsuite('rpc.lsa.secrets', env, ["%s:$SERVER[]" %
(transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN',
'--option=gensec:target_hostname=$NETBIOSNAME', 'rpc.lsa.secrets'],
"samba4.rpc.lsa.secrets on %s with Kerberos" % (transport,))
+ plansmbtorturetestsuite('rpc.lsa.secrets', env, ["%s:$SERVER[]" %
(transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN',
"--option=clientusespnegoprincipal=yes",
'--option=gensec:target_hostname=$NETBIOSNAME'], "samba4.rpc.lsa.secrets on %s
with Kerberos - use target principal" % (transport,))
+ plansmbtorturetestsuite('rpc.lsa.secrets.none*', env, ["%s:$SERVER" %
transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN',
"--option=gensec:fake_gssapi_krb5=yes", '--option=gensec:gssapi_krb5=no',
'--option=gensec:target_hostname=$NETBIOSNAME'], "samba4.rpc.lsa.secrets on %s
with Kerberos - use Samba3 style login" % transport)
+ plansmbtorturetestsuite('rpc.lsa.secrets.none*', env, ["%s:$SERVER" %
transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN',
"--option=clientusespnegoprincipal=yes",
'--option=gensec:fake_gssapi_krb5=yes', '--option=gensec:gssapi_krb5=no',
'--option=gensec:target_hostname=$NETBIOSNAME'], "samba4.rpc.lsa.secrets on %s
with Kerberos - use Samba3 style login, use target principal" % transport)
+ plansmbtorturetestsuite('rpc.echo', env, ["%s:$SERVER[]" %
(transport,), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN'], "samba4.rpc.echo on
%s" % (transport, ))
# Echo tests test bulk Kerberos encryption of DCE/RPC
for bindoptions in ["connect", "spnego", "spnego,sign", "spnego,seal"]
+ validate_list + ["padcheck", "bigendian", "bigendian,seal"]:
echooptions = "--option=socket:testnonblock=True
--option=torture:quick=yes -k yes"
- plantestsuite_loadlist("samba4.rpc.echo on %s with %s and %s" %
(transport, bindoptions, echooptions), env, [smb4torture, "$LISTOPT",
"%s:$SERVER[%s]" % (transport, bindoptions), echooptions,
'-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.echo'])
+ plansmbtorturetestsuite('rpc.echo', env, ["%s:$SERVER[%s]" %
(transport, bindoptions), echooptions, '-U$USERNAME%$PASSWORD', '-W',
'$DOMAIN'], "samba4.rpc.echo on %s with %s and %s" % (transport, bindoptions,
echooptions))
plansmbtorturetestsuite("net.api.become.dc", env, '$SERVER[%s]
-U$USERNAME%%$PASSWORD -W $DOMAIN' % validate)
for bindoptions in ["sign", "seal"]:
- env = "dc"
- plantestsuite_loadlist("samba4.rpc.backupkey with %s" % (bindoptions),
env, [smb4torture, "$LISTOPT", "ncacn_np:$SERVER[%s]" % ( bindoptions),
'-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.backupkey'])
+ plansmbtorturetestsuite('rpc.backupkey', "dc", ["ncacn_np:$SERVER[%s]" % (
bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN'], "samba4.rpc.backupkey
with %s" % (bindoptions))
for transport in transports:
for bindoptions in ["sign", "seal"]:
@@ -226,11 +228,11 @@ for transport in transports:
env = "dc:local"
else:
env = "dc"
- plantestsuite_loadlist("samba4.rpc.echo on %s with %s and %s" %
(transport, bindoptions, ntlmoptions), env, [smb4torture, "$LISTOPT",
"%s:$SERVER[%s]" % (transport, bindoptions), ntlmoptions,
'-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.echo'])
+ plansmbtorturetestsuite('rpc.echo', env, ["%s:$SERVER[%s]" %
(transport, bindoptions), ntlmoptions, '-U$USERNAME%$PASSWORD', '-W',
'$DOMAIN'], "samba4.rpc.echo on %s with %s and %s" % (transport, bindoptions,
ntlmoptions))
-plantestsuite_loadlist("samba4.rpc.echo on ncacn_np over smb2", "dc",
[smb4torture, "$LISTOPT", 'ncacn_np:$SERVER[smb2]', '-U$USERNAME%$PASSWORD',
'-W', '$DOMAIN', 'rpc.echo'])
+plansmbtorturetestsuite('rpc.echo', "dc", ['ncacn_np:$SERVER[smb2]',
'-U$USERNAME%$PASSWORD', '-W', '$DOMAIN'], "samba4.rpc.echo on ncacn_np over
smb2")
-plantestsuite_loadlist("samba4.ntp.signd", "dc:local", [smb4torture,
"$LISTOPT", 'ncacn_np:$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN',
'ntp.signd'])
+plansmbtorturetestsuite('ntp.signd', "dc:local", ['ncacn_np:$SERVER',
'-U$USERNAME%$PASSWORD', '-W', '$DOMAIN'], "samba4.ntp.signd")
nbt_tests = smb4torture_testsuites("nbt.")
for t in nbt_tests:
@@ -258,13 +260,13 @@ for t in smb4torture_testsuites("rap."):
# Tests against the NTVFS CIFS backend
for t in base + raw:
- plantestsuite_loadlist("samba4.ntvfs.cifs.krb5.%s" % t, "dc",
[valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/cifs',
'-U$USERNAME%$PASSWORD', '--kerberos=yes'] + ntvfsargs + [t])
+ plansmbtorturetestsuite(t, "dc", ['//$NETBIOSNAME/cifs',
'-U$USERNAME%$PASSWORD', '--kerberos=yes'] + ntvfsargs,
modname="samba4.ntvfs.cifs.krb5.%s" % t)
# Test NTVFS CIFS backend with S4U2Self and S4U2Proxy
t = "base.unlink"
-plantestsuite_loadlist("samba4.ntvfs.cifs.ntlm.%s" % t, "dc",
[valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/cifs',
'-U$USERNAME%$PASSWORD', '--kerberos=no'] + ntvfsargs + [t])
-plantestsuite_loadlist("samba4.ntvfs.cifs.krb5.%s" % t, "rpc_proxy",
[valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/cifs_to_dc',
'-U$DC_USERNAME%$DC_PASSWORD', '--kerberos=yes'] + ntvfsargs + [t])
-plantestsuite_loadlist("samba4.ntvfs.cifs.ntlm.%s" % t, "rpc_proxy",
[valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/cifs_to_dc',
'-U$DC_USERNAME%$DC_PASSWORD', '--kerberos=no'] + ntvfsargs + [t])
+plansmbtorturetestsuite(t, "dc", ['//$NETBIOSNAME/cifs',
'-U$USERNAME%$PASSWORD', '--kerberos=no'] + ntvfsargs,
"samba4.ntvfs.cifs.ntlm.%s" % t)
+plansmbtorturetestsuite(t, "rpc_proxy", ['//$NETBIOSNAME/cifs_to_dc',
'-U$DC_USERNAME%$DC_PASSWORD', '--kerberos=yes'] + ntvfsargs,
"samba4.ntvfs.cifs.krb5.%s" % t)
+plansmbtorturetestsuite(t, "rpc_proxy", ['//$NETBIOSNAME/cifs_to_dc',
'-U$DC_USERNAME%$DC_PASSWORD', '--kerberos=no'] + ntvfsargs,
"samba4.ntvfs.cifs.ntlm.%s" % t)
plansmbtorturetestsuite('echo.udp', 'dc:local', '//$SERVER/whatever')
@@ -274,9 +276,9 @@ for t in smb4torture_testsuites("local."):
# Confirm these tests with the system iconv too
for t in ["local.convert_string_handle", "local.convert_string", "local.ndr"]:
- modname = "samba4.%s.system.iconv" % t
- cmdline = "%s %s %s" % (valgrindify(smb4torture), "ncalrpc:
--option='iconv:use_builtin_handlers=false'", t)
- plantestsuite_loadlist(modname, "none", cmdline)
+ options = "ncalrpc: --option='iconv:use_builtin_handlers=false'"
+ plansmbtorturetestsuite(t, "none", options,
+ modname="samba4.%s.system.iconv" % t)
tdbtorture4 = binpath("tdbtorture")
if os.path.exists(tdbtorture4):
@@ -317,18 +319,18 @@ plantestsuite("samba4.blackbox.chgdcpass(dc)", "dc",
[os.path.join(bbdir, "test_
# Tests using the "Simple" NTVFS backend
for t in ["base.rw1"]:
- plantestsuite_loadlist("samba4.ntvfs.simple.%s" % t, "dc",
[valgrindify(smb4torture), "$LISTOPT", "//$SERVER/simple",
'-U$USERNAME%$PASSWORD', t])
+ plansmbtorturetestsuite(t, "dc", ["//$SERVER/simple",
'-U$USERNAME%$PASSWORD'], modname="samba4.ntvfs.simple.%s" % t)
# Domain S4member Tests
-plantestsuite_loadlist("samba4.rpc.echo against s4member server with local
creds", "s4member", [valgrindify(smb4torture), "$LISTOPT",
'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'rpc.echo'])
-plantestsuite_loadlist("samba4.rpc.echo against s4member server with domain
creds", "s4member", [valgrindify(smb4torture), "$LISTOPT",
'ncacn_np:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD', 'rpc.echo'])
-plantestsuite_loadlist("samba4.rpc.samr against s4member server with local
creds", "s4member", [valgrindify(smb4torture), "$LISTOPT",
'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "rpc.samr"])
-plantestsuite_loadlist("samba4.rpc.samr.users against s4member server with
local creds", "s4member", [valgrindify(smb4torture), "$LISTOPT",
'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD',
"rpc.samr.users"])
-plantestsuite_loadlist("samba4.rpc.samr.passwords against s4member server with
local creds", "s4member", [valgrindify(smb4torture), "$LISTOPT",
'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD',
"rpc.samr.passwords"])
+plansmbtorturetestsuite('rpc.echo', "s4member", ['ncacn_np:$NETBIOSNAME',
'-U$NETBIOSNAME/$USERNAME%$PASSWORD'], "samba4.rpc.echo against s4member server
with local creds")
+plansmbtorturetestsuite('rpc.echo', "s4member", ['ncacn_np:$NETBIOSNAME',
'-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'], "samba4.rpc.echo against s4member
server with domain creds")
+plansmbtorturetestsuite('rpc.samr', "s4member", ['ncacn_np:$NETBIOSNAME',
'-U$NETBIOSNAME/$USERNAME%$PASSWORD'], "samba4.rpc.samr against s4member server
with local creds")
+plansmbtorturetestsuite('rpc.samr.users', "s4member",
['ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD'],
"samba4.rpc.samr.users against s4member server with local creds",)
+plansmbtorturetestsuite('rpc.samr.passwords', "s4member",
['ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD'],
"samba4.rpc.samr.passwords against s4member server with local creds")
plantestsuite("samba4.blackbox.smbclient against s4member server with local
creds", "s4member", [os.path.join(samba4srcdir,
"client/tests/test_smbclient.sh"), '$NETBIOSNAME', '$USERNAME', '$PASSWORD',
'$NETBIOSNAME', '$PREFIX'])
# RPC Proxy
-plantestsuite_loadlist("samba4.rpc.echo against rpc proxy with domain creds",
"rpc_proxy", [valgrindify(smb4torture), "$LISTOPT",
'ncacn_ip_tcp:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD', "rpc.echo"])
+plansmbtorturetestsuite("rpc.echo", "rpc_proxy", ['ncacn_ip_tcp:$NETBIOSNAME',
'-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'], modname="samba4.rpc.echo against rpc
proxy with domain creds")
# Tests SMB signing
for mech in [
@@ -340,7 +342,7 @@ for mech in [
for signing in ["--signing=on", "--signing=required"]:
signoptions = "%s %s" % (mech, signing)
name = "smb.signing on with %s" % signoptions
- plantestsuite_loadlist("samba4.%s" % name, "dc",
[valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share',
signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy'])
+ plansmbtorturetestsuite('base.xcopy', "dc",
['//$NETBIOSNAME/xcopy_share', signoptions, '-U$USERNAME%$PASSWORD'],
modname="samba4.%s" % name)
for mech in [
"-k no",
@@ -349,24 +351,23 @@ for mech in [
"-k yes"]:
signoptions = "%s --signing=off" % mech
name = "smb.signing disabled on with %s" % signoptions
- plantestsuite_loadlist("samba4.%s domain-creds" % name, "s4member",
[valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share',
signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
+ plansmbtorturetestsuite('base.xcopy', "s4member",
['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'],
"samba4.%s domain-creds" % name)
if have_ads_support:
- plantestsuite_loadlist("samba4.%s domain-creds" % name, "s3member",
[valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share',
signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
- plantestsuite_loadlist("samba4.%s" % name, "plugin_s4_dc",
[valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share',
signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy'])
- plantestsuite_loadlist("samba4.%s administrator" % name,
"plugin_s4_dc",
- [valgrindify(smb4torture), "$LISTOPT",
'//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD',
'base.xcopy'])
+ plansmbtorturetestsuite('base.xcopy', "s3member",
['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'],
"samba4.%s domain-creds" % name)
+ plansmbtorturetestsuite('base.xcopy', "plugin_s4_dc",
['//$NETBIOSNAME/xcopy_share', signoptions, '-U$USERNAME%$PASSWORD'],
"samba4.%s" % name)
+ plansmbtorturetestsuite('base.xcopy', "plugin_s4_dc",
+ ['//$NETBIOSNAME/xcopy_share', signoptions,
'-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s administrator" % name)
for mech in [
"-k no",
"-k no --option=usespnego=no",
"-k no --option=gensec:spengo=no"]:
signoptions = "%s --signing=off" % mech
- name = "smb.signing on with %s" % signoptions
- plantestsuite_loadlist("samba4.%s local-creds" % name, "s4member",
[valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share',
signoptions, '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'base.xcopy'])
+ plansmbtorturetestsuite('base.xcopy', "s4member",
['//$NETBIOSNAME/xcopy_share', signoptions,
'-U$NETBIOSNAME/$USERNAME%$PASSWORD'], modname="samba4.smb.signing on with %s
local-creds" % signoptions)
-plantestsuite_loadlist("samba4.smb.signing --signing=yes anon", "dc",
[valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share', '-k',
'no', '--signing=yes', '-U%', 'base.xcopy'])
-plantestsuite_loadlist("samba4.smb.signing --signing=required anon", "dc",
[valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share', '-k',
'no', '--signing=required', '-U%', 'base.xcopy'])
-plantestsuite_loadlist("samba4.smb.signing --signing=no anon", "s4member",
[valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/xcopy_share', '-k',
'no', '--signing=no', '-U%', 'base.xcopy'])
+plansmbtorturetestsuite('base.xcopy', "dc", ['//$NETBIOSNAME/xcopy_share',
'-k', 'no', '--signing=yes', '-U%'], modname="samba4.smb.signing --signing=yes
anon")
+plansmbtorturetestsuite('base.xcopy', "dc", ['//$NETBIOSNAME/xcopy_share',
'-k', 'no', '--signing=required', '-U%'], modname="samba4.smb.signing
--signing=required anon")
+plansmbtorturetestsuite('base.xcopy', "s4member",
['//$NETBIOSNAME/xcopy_share', '-k', 'no', '--signing=no', '-U%'],
modname="samba4.smb.signing --signing=no anon")
wb_opts = ["--option=\"torture:strict mode=no\"",
"--option=\"torture:timelimit=1\"",
"--option=\"torture:winbindd_separator=/\"",
"--option=\"torture:winbindd_netbios_name=$SERVER\"",
"--option=\"torture:winbindd_netbios_domain=$DOMAIN\""]
@@ -497,14 +498,14 @@ planoldpythontestsuite("vampire_dc", "repl_schema",
# This makes sure we test the rid allocation code
t = "rpc.samr.large-dc"
-plantestsuite_loadlist("samba4.%s.one" % t, "vampire_dc",
[valgrindify(smb4torture), "$LISTOPT", '$SERVER', '-U$USERNAME%$PASSWORD',
'-W', '$DOMAIN', t])
-plantestsuite_loadlist("samba4.%s.two" % t, "vampire_dc",
[valgrindify(smb4torture), "$LISTOPT", '$SERVER', '-U$USERNAME%$PASSWORD',
'-W', '$DOMAIN', t])
+plansmbtorturetestsuite(t, "vampire_dc", ['$SERVER', '-U$USERNAME%$PASSWORD',
'-W', '$DOMAIN'], modname=("samba4.%s.one" % t))
+plansmbtorturetestsuite(t, "vampire_dc", ['$SERVER', '-U$USERNAME%$PASSWORD',
'-W', '$DOMAIN'], modname="samba4.%s.two" % t)
# some RODC testing
for env in ['rodc']:
- plantestsuite_loadlist("samba4.rpc.echo", env, [smb4torture, "$LISTOPT",
'ncacn_np:$SERVER', "-k", "yes", '-U$USERNAME%$PASSWORD', '-W' '$DOMAIN',
'rpc.echo'])
- plantestsuite_loadlist("samba4.rpc.echo", "%s:local" % env, [smb4torture,
"$LISTOPT", 'ncacn_np:$SERVER', "-k", "yes", '-P', '-W' '$DOMAIN', 'rpc.echo'])
-plantestsuite("samba4.blackbox.provision-backend.py", "none", ["PYTHON=%s" %
python, os.path.join(samba4srcdir,
"setup/tests/blackbox_provision-backend.sh"), '$PREFIX/provision'])
+ plansmbtorturetestsuite('rpc.echo', env, ['ncacn_np:$SERVER', "-k", "yes",
'-U$USERNAME%$PASSWORD', '-W' '$DOMAIN'], modname="samba4.rpc.echo")
+ plansmbtorturetestsuite('rpc.echo', "%s:local" % env, ['ncacn_np:$SERVER',
"-k", "yes", '-P', '-W' '$DOMAIN'], modname="samba4.rpc.echo")
+plantestsuite("samba4.blackbox.provision-backend", "none", ["PYTHON=%s" %
python, os.path.join(samba4srcdir,
"setup/tests/blackbox_provision-backend.sh"), '$PREFIX/provision'])
# Test renaming the DC
plantestsuite("samba4.blackbox.renamedc.sh", "none", ["PYTHON=%s" % python,
os.path.join(bbdir, "renamedc.sh"), '$PREFIX/provision'])
--
Samba Shared Repository
