Ignore:
Timestamp:
Nov 24, 2016, 1:14:11 PM (9 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: update vendor to version 4.4.3

File:
1 edited

Legend:

Unmodified
Added
Removed
  • vendor/current/source4/selftest/tests.py

    r740 r988  
    2121import os, sys
    2222sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../selftest"))
     23import selftesthelpers
    2324from selftesthelpers import *
    24 import subprocess
     25
     26print >>sys.stderr, "OPTIONS %s" % " ".join(smbtorture4_options)
     27
     28def plansmbtorture4testsuite(name, env, options, modname=None):
     29    return selftesthelpers.plansmbtorture4testsuite(name, env, options,
     30        target='samba4', modname=modname)
    2531
    2632samba4srcdir = source4dir()
    2733samba4bindir = bindir()
    28 smb4torture = binpath("smbtorture")
    29 smb4torture_testsuite_list = subprocess.Popen([smb4torture, "--list-suites"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate("")[0].splitlines()
    3034validate = os.getenv("VALIDATE", "")
    3135if validate:
     
    3438    validate_list = []
    3539
    36 def plansmbtorturetestsuite(name, env, options):
    37     modname = "samba4.%s" % name
    38     cmdline = "%s $LISTOPT %s %s" % (valgrindify(smb4torture), options, name)
    39     plantestsuite_loadlist(modname, env, cmdline)
    40 
    41 def smb4torture_testsuites(prefix):
    42     return filter(lambda x: x.startswith(prefix), smb4torture_testsuite_list)
    43 
    44 subprocess.call([smb4torture, "-V"])
     40nmblookup4 = binpath('nmblookup4')
     41smbclient4 = binpath('smbclient4')
    4542
    4643bbdir = os.path.join(srcdir(), "testprogs/blackbox")
    4744
    48 configuration = "--configfile=$SMB_CONF_PATH"
    49 
    50 torture_options = [configuration, "--maximum-runtime=$SELFTEST_MAXTIME", "--target=$SELFTEST_TARGET", "--basedir=$SELFTEST_TMPDIR"]
    51 if not os.getenv("SELFTEST_VERBOSE"):
    52     torture_options.append("--option=torture:progress=no")
    53 torture_options.append("--format=subunit")
    54 if os.getenv("SELFTEST_QUICK"):
    55     torture_options.append("--option=torture:quick=yes")
    56 smb4torture += " " + " ".join(torture_options)
    57 
    58 print "OPTIONS %s" % " ".join(torture_options)
    59 
    6045# Simple tests for LDAP and CLDAP
    61 for options in ['-U"$USERNAME%$PASSWORD" --option=socket:testnonblock=true', '-U"$USERNAME%$PASSWORD"', '-U"$USERNAME%$PASSWORD" -k yes', '-U"$USERNAME%$PASSWORD" -k no', '-U"$USERNAME%$PASSWORD" -k no --sign', '-U"$USERNAME%$PASSWORD" -k no --encrypt', '-U"$USERNAME%$PASSWORD" -k yes --encrypt', '-U"$USERNAME%$PASSWORD" -k yes --sign']:
    62     plantestsuite("samba4.ldb.ldap with options %s(dc)" % options, "dc", "%s/test_ldb.sh ldap $SERVER %s" % (bbdir, options))
    63 
    64 # see if we support ldaps
     46for auth_type in ['', '-k no', '-k yes']:
     47    for auth_level in ['--option=clientldapsaslwrapping=plain', '--sign', '--encrypt']:
     48        creds = '-U"$USERNAME%$PASSWORD"'
     49        options = creds + ' ' + auth_type + ' ' + auth_level
     50        plantestsuite("samba4.ldb.ldap with options %r(ad_dc_ntvfs)" % options, "ad_dc_ntvfs", "%s/test_ldb.sh ldap $SERVER %s" % (bbdir, options))
     51
     52# see if we support ADS on the Samba3 side
    6553try:
    6654    config_h = os.environ["CONFIG_H"]
    6755except KeyError:
    68     config_h = os.path.join(samba4bindir, "default/source4/include/config.h")
     56    config_h = os.path.join(samba4bindir, "default/include/config.h")
     57
     58# check available features
     59config_hash = dict()
    6960f = open(config_h, 'r')
    7061try:
    71     have_tls_support = ("ENABLE_GNUTLS 1" in f.read())
     62    lines = f.readlines()
     63    config_hash = dict((x[0], ' '.join(x[1:]))
     64            for x in map(lambda line: line.strip().split(' ')[1:],
     65                         filter(lambda line: (line[0:7] == '#define') and (len(line.split(' ')) > 2), lines)))
    7266finally:
    7367    f.close()
    7468
     69have_tls_support = ("ENABLE_GNUTLS" in config_hash)
     70have_heimdal_support = ("SAMBA4_USES_HEIMDAL" in config_hash)
     71
    7572if have_tls_support:
    7673    for options in ['-U"$USERNAME%$PASSWORD"']:
    77         plantestsuite("samba4.ldb.ldaps with options %s(dc)" % options, "dc",
     74        plantestsuite("samba4.ldb.ldaps with options %s(ad_dc_ntvfs)" % options, "ad_dc_ntvfs",
    7875                "%s/test_ldb.sh ldaps $SERVER_IP %s" % (bbdir, options))
    7976
     77    creds_options = [
     78        '--simple-bind-dn=$USERNAME@$REALM --password=$PASSWORD',
     79    ]
     80    peer_options = {
     81        'SERVER_IP': '$SERVER_IP',
     82        'SERVER_NAME': '$SERVER',
     83        'SERVER.REALM': '$SERVER.$REALM',
     84    }
     85    tls_verify_options = [
     86        '--option="tlsverifypeer=no_check"',
     87        '--option="tlsverifypeer=ca_only"',
     88        '--option="tlsverifypeer=ca_and_name_if_available"',
     89        '--option="tlsverifypeer=ca_and_name"',
     90        '--option="tlsverifypeer=as_strict_as_possible"',
     91    ]
     92
     93    # we use :local for fl2008r2dc because of the self-signed certificate
     94    for env in ["ad_dc_ntvfs", "fl2008r2dc:local"]:
     95        for peer_key in peer_options.keys():
     96            peer_val = peer_options[peer_key]
     97            for creds in creds_options:
     98                for tls_verify in tls_verify_options:
     99                    options = creds + ' ' + tls_verify
     100                    plantestsuite("samba4.ldb.simple.ldaps with options %s %s(%s)" % (
     101                                  peer_key, options, env), env,
     102                                  "%s/test_ldb_simple.sh ldaps %s %s" % (bbdir, peer_val, options))
     103
     104# test all "ldap server require strong auth" combinations
     105for env in ["ad_dc_ntvfs", "fl2008r2dc", "fl2003dc"]:
     106    options = '--simple-bind-dn="$USERNAME@$REALM" --password="$PASSWORD"'
     107    plantestsuite("samba4.ldb.simple.ldap with SIMPLE-BIND %s(%s)" % (options, env),
     108                  env, "%s/test_ldb_simple.sh ldap $SERVER %s" % (bbdir, options))
     109    if have_tls_support:
     110        options += ' --option="tlsverifypeer=no_check"'
     111        plantestsuite("samba4.ldb.simple.ldaps with SIMPLE-BIND %s(%s)" % (options, env),
     112                      env, "%s/test_ldb_simple.sh ldaps $SERVER %s" % (bbdir, options))
     113
     114    auth_options = [
     115        '--option=clientldapsaslwrapping=plain',
     116        '--sign',
     117        '--encrypt',
     118    ]
     119
     120    for auth_option in auth_options:
     121        options = '-U"$USERNAME%$PASSWORD"' + ' ' + auth_option
     122        plantestsuite("samba4.ldb.simple.ldap with SASL-BIND %s(%s)" % (options, env),
     123                      env, "%s/test_ldb_simple.sh ldap $SERVER %s" % (bbdir, options))
     124    if have_tls_support:
     125        options = '-U"$USERNAME%$PASSWORD" --option="tlsverifypeer=no_check"'
     126        plantestsuite("samba4.ldb.simple.ldaps with SASL-BIND %s(%s)" % (options, env),
     127                      env, "%s/test_ldb_simple.sh ldaps $SERVER %s" % (bbdir, options))
     128
    80129for options in ['-U"$USERNAME%$PASSWORD"']:
    81     plantestsuite("samba4.ldb.ldapi with options %s(dc:local)" % options, "dc:local",
    82             "%s/test_ldb.sh ldapi $PREFIX_ABS/dc/private/ldapi %s" % (bbdir, options))
    83 
    84 for t in smb4torture_testsuites("ldap."):
    85     plansmbtorturetestsuite(t, "dc", '-U"$USERNAME%$PASSWORD" //$SERVER_IP/_none_')
    86 
    87 ldbdir = os.path.join(samba4srcdir, "lib/ldb")
     130    plantestsuite("samba4.ldb.ldapi with options %s(ad_dc_ntvfs:local)" % options, "ad_dc_ntvfs:local",
     131            "%s/test_ldb.sh ldapi $PREFIX_ABS/ad_dc_ntvfs/private/ldapi %s" % (bbdir, options))
     132
     133for t in smbtorture4_testsuites("ldap."):
     134    plansmbtorture4testsuite(t, "ad_dc_ntvfs", '-U"$USERNAME%$PASSWORD" //$SERVER_IP/_none_')
     135
     136ldbdir = os.path.join(srcdir(), "lib/ldb")
    88137# Don't run LDB tests when using system ldb, as we won't have ldbtest installed
    89138if os.path.exists(os.path.join(samba4bindir, "ldbtest")):
    90     plantestsuite("ldb.base", "none", "%s/tests/test-tdb.sh" % ldbdir,
    91                   allow_empty_output=True)
     139    plantestsuite("ldb.base", "none", "%s/tests/test-tdb-subunit.sh %s" % (ldbdir, samba4bindir))
    92140else:
    93141    skiptestsuite("ldb.base", "Using system LDB, ldbtest not available")
     
    97145# add tests to this list as they start passing, so we test
    98146# that they stay passing
    99 ncacn_np_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.altercontext", "rpc.multibind", "rpc.netlogon", "rpc.handles", "rpc.samsync", "rpc.samba3-sessionkey", "rpc.samba3-getusername", "rpc.samba3-lsa", "rpc.samba3-bind", "rpc.samba3-netlogon", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext"]
    100 ncalrpc_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.altercontext", "rpc.multibind", "rpc.netlogon", "rpc.drsuapi", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext"]
    101 drs_rpc_tests = smb4torture_testsuites("drs.rpc")
    102 ncacn_ip_tcp_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.altercontext", "rpc.multibind", "rpc.netlogon", "rpc.handles", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext", "rpc.objectuuid"] + drs_rpc_tests
    103 slow_ncacn_np_tests = ["rpc.samlogon", "rpc.samr.users", "rpc.samr.large-dc", "rpc.samr.users.privileges", "rpc.samr.passwords", "rpc.samr.passwords.pwdlastset"]
    104 slow_ncacn_ip_tcp_tests = ["rpc.samr", "rpc.cracknames"]
     147ncacn_np_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.altercontext", "rpc.netlogon", "rpc.netlogon.admin", "rpc.handles", "rpc.samsync", "rpc.samba3-sessionkey", "rpc.samba3-getusername", "rpc.samba3-lsa", "rpc.samba3-bind", "rpc.samba3-netlogon", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext"]
     148ncalrpc_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.altercontext", "rpc.netlogon", "rpc.netlogon.admin", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext"]
     149drs_rpc_tests = smbtorture4_testsuites("drs.rpc")
     150ncacn_ip_tcp_tests = ["rpc.schannel", "rpc.join", "rpc.lsa", "rpc.dssetup", "rpc.drsuapi", "rpc.netlogon", "rpc.netlogon.admin", "rpc.asyncbind", "rpc.lsalookup", "rpc.lsa-getuser", "rpc.schannel2", "rpc.authcontext", "rpc.samr.passwords.validate"] + drs_rpc_tests
     151slow_ncacn_np_tests = ["rpc.samlogon", "rpc.samr", "rpc.samr.users", "rpc.samr.large-dc", "rpc.samr.users.privileges", "rpc.samr.passwords", "rpc.samr.passwords.pwdlastset", "rpc.samr.passwords.lockout", "rpc.samr.passwords.badpwdcount"]
     152slow_ncacn_ip_tcp_tests = ["rpc.cracknames"]
    105153
    106154all_rpc_tests = ncalrpc_tests + ncacn_np_tests + ncacn_ip_tcp_tests + slow_ncacn_np_tests + slow_ncacn_ip_tcp_tests + ["rpc.lsa.secrets", "rpc.pac", "rpc.samba3-sharesec", "rpc.countcalls"]
    107155
    108156# Make sure all tests get run
    109 rpc_tests = smb4torture_testsuites("rpc.")
     157rpc_tests = smbtorture4_testsuites("rpc.")
    110158auto_rpc_tests = filter(lambda t: t not in all_rpc_tests, rpc_tests)
    111159
    112160for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
    113161    for transport in ["ncalrpc", "ncacn_np", "ncacn_ip_tcp"]:
    114         env = "dc"
     162        env = "ad_dc_ntvfs"
    115163        if transport == "ncalrpc":
    116164            tests = ncalrpc_tests
    117             env = "dc:local"
     165            env = "ad_dc_ntvfs:local"
    118166        elif transport == "ncacn_np":
    119167            tests = ncacn_np_tests
    120168        elif transport == "ncacn_ip_tcp":
    121169            tests = ncacn_ip_tcp_tests
     170        else:
     171            raise AssertionError("invalid transport %r"% transport)
    122172        for t in tests:
    123             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])
    124         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'])
     173            plansmbtorture4testsuite(t, env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s on %s with %s" % (t, transport, bindoptions))
     174        plansmbtorture4testsuite('rpc.samba3-sharesec', env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=torture:share=tmp'], "samba4.rpc.samba3.sharesec on %s with %s" % (transport, bindoptions))
     175
     176#Plugin S4 DC tests (confirms named pipe auth forwarding).  This can be expanded once kerberos is supported in the plugin DC
     177#
     178for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
     179    for t in ncacn_np_tests:
     180        env = "ad_dc"
     181        transport = "ncacn_np"
     182        plansmbtorture4testsuite(t, env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s with %s" % (t, bindoptions))
    125183
    126184for bindoptions in [""] + validate_list + ["bigendian"]:
    127185    for t in auto_rpc_tests:
    128         plantestsuite_loadlist("samba4.%s with %s" % (t, bindoptions), "dc", [valgrindify(smb4torture), "$LISTOPT", "$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
     186        plansmbtorture4testsuite(t, "ad_dc_ntvfs", ["$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s with %s" % (t, bindoptions))
    129187
    130188t = "rpc.countcalls"
    131 plantestsuite_loadlist("samba4.%s" % t, "dc:local", [valgrindify(smb4torture), "$LISTOPT", "$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
     189plansmbtorture4testsuite(t, "ad_dc_ntvfs:local", ["$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], modname="samba4.%s" % t)
    132190
    133191for transport in ["ncacn_np", "ncacn_ip_tcp"]:
    134     env = "dc"
     192    env = "ad_dc_ntvfs"
    135193    if transport == "ncacn_np":
    136194        tests = slow_ncacn_np_tests
    137195    elif transport == "ncacn_ip_tcp":
    138196        tests = slow_ncacn_ip_tcp_tests
     197    else:
     198        raise AssertionError("Invalid transport %r" % transport)
    139199    for t in tests:
    140         plantestsuite_loadlist("samba4.%s on %s" % (t, transport), env, [valgrindify(smb4torture), "$LISTOPT", "%s:$SERVER" % transport, '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
     200        bindoptions = ''
     201        if t == 'rpc.cracknames':
     202            bindoptions = 'seal'
     203        plansmbtorture4testsuite(t, env, ["%s:$SERVER[%s]" % (transport,bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s on %s with %s" % (t, transport, bindoptions))
    141204
    142205# Tests for the DFS referral calls implementation
    143 for t in smb4torture_testsuites("dfs."):
    144     plansmbtorturetestsuite(t, "dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
     206for t in smbtorture4_testsuites("dfs."):
     207    plansmbtorture4testsuite(t, "ad_dc_ntvfs", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
     208    plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
    145209
    146210# Tests for the NET API (net.api.become.dc tested below against all the roles)
    147 net_tests = filter(lambda x: "net.api.become.dc" not in x, smb4torture_testsuites("net."))
     211net_tests = filter(lambda x: "net.api.become.dc" not in x, smbtorture4_testsuites("net."))
    148212for t in net_tests:
    149     plansmbtorturetestsuite(t, "dc", '$SERVER[%s] -U$USERNAME%%$PASSWORD -W $DOMAIN' % validate)
     213    plansmbtorture4testsuite(t, "ad_dc_ntvfs", '$SERVER[%s] -U$USERNAME%%$PASSWORD -W$DOMAIN' % validate)
    150214
    151215# Tests for session keys and encryption of RPC pipes
     
    153217
    154218transport = "ncacn_np"
    155 for ntlmoptions in [
    156     "-k no --option=usespnego=yes",
    157     "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no",
    158     "-k no --option=usespnego=yes --option=ntlmssp_client:56bit=yes",
    159     "-k no --option=usespnego=yes --option=ntlmssp_client:56bit=no",
    160     "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=yes",
    161     "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=no",
    162     "-k no --option=usespnego=yes --option=clientntlmv2auth=yes",
    163     "-k no --option=usespnego=yes --option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no",
    164     "-k no --option=usespnego=yes --option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=yes",
    165     "-k no --option=usespnego=no --option=clientntlmv2auth=yes",
    166     "-k no --option=gensec:spnego=no --option=clientntlmv2auth=yes",
    167     "-k no --option=usespnego=no"]:
    168     name = "rpc.lsa.secrets on %s with with %s" % (transport, ntlmoptions)
    169     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'])
     219for env in ["ad_dc_ntvfs", "nt4_dc"]:
     220    for ntlmoptions in [
     221        "-k no --option=usespnego=yes",
     222        "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no",
     223        "-k no --option=usespnego=yes --option=ntlmssp_client:56bit=yes",
     224        "-k no --option=usespnego=yes --option=ntlmssp_client:56bit=no",
     225        "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=yes",
     226        "-k no --option=usespnego=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=no",
     227        "-k no --option=usespnego=yes --option=clientntlmv2auth=yes",
     228        "-k no --option=usespnego=yes --option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no",
     229        "-k no --option=usespnego=yes --option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:56bit=yes",
     230        "-k no --option=usespnego=no --option=clientntlmv2auth=yes",
     231        "-k no --option=gensec:spnego=no --option=clientntlmv2auth=yes",
     232        "-k no --option=usespnego=no"]:
     233        name = "rpc.lsa.secrets on %s with with %s" % (transport, ntlmoptions)
     234        plansmbtorture4testsuite('rpc.lsa.secrets', env, ["%s:$SERVER[]" % (transport), ntlmoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME'], "samba4.%s" % name)
     235    plantestsuite("samba.blackbox.pdbtest(%s)" % env, "%s:local" % env, [os.path.join(bbdir, "test_pdbtest.sh"), '$SERVER', "$PREFIX", "pdbtest", smbclient4, '$SMB_CONF_PATH', configuration])
     236    plantestsuite("samba.blackbox.pdbtest.winbind(%s)" % env, "%s:local" % env, [os.path.join(bbdir, "test_pdbtest.sh"), '$SERVER', "$PREFIX", "pdbtest2", smbclient4, '$SMB_CONF_PATH', configuration + " --option='authmethods=wbc'"])
     237
     238plantestsuite("samba.blackbox.pdbtest.s4winbind(ad_dc_ntvfs)", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_pdbtest.sh"), '$SERVER', "$PREFIX", "pdbtest3", smbclient4, '$SMB_CONF_PATH', configuration + " --option='authmethods=samba4:winbind'"])
     239plantestsuite("samba.blackbox.pdbtest.s4winbind_wbclient(ad_dc_ntvfs)", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_pdbtest.sh"), '$SERVER', "$PREFIX", "pdbtest4", smbclient4, '$SMB_CONF_PATH', configuration + " --option='authmethods=samba4:winbind_wbclient'"])
    170240
    171241transports = ["ncacn_np", "ncacn_ip_tcp"]
    172242
    173243#Kerberos varies between functional levels, so it is important to check this on all of them
    174 for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
     244for env in ["ad_dc_ntvfs", "fl2000dc", "fl2003dc", "fl2008r2dc", "ad_dc"]:
    175245    transport = "ncacn_np"
    176     plantestsuite_loadlist("samba4.rpc.pac on %s" % (transport,), env, [smb4torture, "$LISTOPT", "%s:$SERVER[]" % (transport, ), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.pac'])
     246    plansmbtorture4testsuite('rpc.pac', env, ["%s:$SERVER[]" % (transport, ), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.rpc.pac on %s" % (transport,))
     247    plansmbtorture4testsuite('rpc.lsa.secrets', env, ["%s:$SERVER[]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=gensec:target_hostname=$NETBIOSNAME', 'rpc.lsa.secrets'], "samba4.rpc.lsa.secrets on %s with Kerberos" % (transport,))
     248    plansmbtorture4testsuite('rpc.lsa.secrets', env, ["%s:$SERVER[]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', "--option=clientusespnegoprincipal=yes", '--option=gensec:target_hostname=$NETBIOSNAME'], "samba4.rpc.lsa.secrets on %s with Kerberos - use target principal" % (transport,))
     249    plansmbtorture4testsuite('rpc.lsa.secrets', env, ["%s:$SERVER[target_principal=dcom/$NETBIOSNAME]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.rpc.lsa.secrets on %s with Kerberos - netbios name principal dcom" % (transport,))
     250    plansmbtorture4testsuite('rpc.lsa.secrets', env, ["%s:$SERVER[target_principal=$NETBIOSNAME\$]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.rpc.lsa.secrets on %s with Kerberos - netbios name principal dollar" % (transport,))
     251    plansmbtorture4testsuite('rpc.lsa.secrets', env, ["%s:$SERVER[target_principal=$NETBIOSNAME]" % (transport, ), '-k', 'yes', '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.rpc.lsa.secrets on %s with Kerberos - netbios name principal" % (transport,))
     252    plansmbtorture4testsuite('rpc.lsa.secrets.none*', env, ["%s:$SERVER" % transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '--workgroup=$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)
     253    plansmbtorture4testsuite('rpc.lsa.secrets.none*', env, ["%s:$SERVER" % transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', "--option=gensec:fake_gssapi_krb5=yes", '--option=gensec:gssapi_krb5=no', '--option=gensec:target_hostname=$NETBIOSNAME', '--option=gensec_krb5:send_authenticator_checksum=false'], "samba4.rpc.lsa.secrets on %s with Kerberos - use raw-krb5-no-authenticator-checksum style login" % transport)
     254    plansmbtorture4testsuite('rpc.lsa.secrets.none*', env, ["%s:$SERVER" % transport, '-k', 'yes', '-U$USERNAME%$PASSWORD', '--workgroup=$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)
     255
     256    # Winreg tests test bulk Kerberos encryption of DCE/RPC
     257    # We test rpc.winreg here too, because the winreg interface if
     258    # handled by the source3/rpc_server code.
     259    for bindoptions in ["connect", "krb5", "krb5,sign", "krb5,seal", "spnego", "spnego,sign", "spnego,seal"]:
     260        plansmbtorture4testsuite('rpc.winreg', env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-k', 'yes', '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.rpc.winreg on %s with %s" % (transport, bindoptions))
     261
    177262    for transport in transports:
    178         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'])
    179         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'])
    180         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*"])
    181         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*"])
    182         plantestsuite_loadlist("samba4.rpc.echo on %s" % (transport, ), env, [smb4torture, "$LISTOPT", "%s:$SERVER[]" % (transport,), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.echo'])
     263        plansmbtorture4testsuite('rpc.echo', env, ["%s:$SERVER[]" % (transport,), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.rpc.echo on %s" % (transport, ))
    183264
    184265        # Echo tests test bulk Kerberos encryption of DCE/RPC
    185         for bindoptions in ["connect", "spnego", "spnego,sign", "spnego,seal"] + validate_list + ["padcheck", "bigendian", "bigendian,seal"]:
     266        for bindoptions in ["connect", "krb5", "krb5,sign", "krb5,seal", "spnego", "spnego,sign", "spnego,seal"] + validate_list + ["padcheck", "bigendian", "bigendian,seal"]:
    186267            echooptions = "--option=socket:testnonblock=True --option=torture:quick=yes -k yes"
    187             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'])
    188     plansmbtorturetestsuite("net.api.become.dc", env, '$SERVER[%s] -U$USERNAME%%$PASSWORD -W $DOMAIN' % validate)
     268            plansmbtorture4testsuite('rpc.echo', env, ["%s:$SERVER[%s]" % (transport, bindoptions), echooptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.rpc.echo on %s with %s and %s" % (transport, bindoptions, echooptions))
     269    plansmbtorture4testsuite("net.api.become.dc", env, '$SERVER[%s] -U$USERNAME%%$PASSWORD -W$DOMAIN' % validate)
    189270
    190271for bindoptions in ["sign", "seal"]:
    191     env = "dc"
    192     plantestsuite_loadlist("samba4.rpc.backupkey with %s" % (bindoptions), env, [smb4torture, "$LISTOPT", "ncacn_np:$SERVER[%s]" % ( bindoptions), '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.backupkey'])
     272    plansmbtorture4testsuite('rpc.backupkey', "ad_dc_ntvfs", ["ncacn_np:$SERVER[%s]" % ( bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.rpc.backupkey with %s" % (bindoptions))
    193273
    194274for transport in transports:
     
    205285        "--option=clientntlmv2auth=yes --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no --option=torture:quick=yes"]:
    206286            if transport == "ncalrpc":
    207                 env = "dc:local"
     287                env = "ad_dc_ntvfs:local"
    208288            else:
    209                 env = "dc"
    210             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'])
    211 
    212 plantestsuite_loadlist("samba4.rpc.echo on ncacn_np over smb2", "dc", [smb4torture, "$LISTOPT", 'ncacn_np:$SERVER[smb2]', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'rpc.echo'])
    213 
    214 plantestsuite_loadlist("samba4.ntp.signd", "dc:local", [smb4torture, "$LISTOPT", 'ncacn_np:$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', 'ntp.signd'])
     289                env = "ad_dc_ntvfs"
     290            plansmbtorture4testsuite('rpc.echo', env, ["%s:$SERVER[%s]" % (transport, bindoptions), ntlmoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.rpc.echo on %s with %s and %s" % (transport, bindoptions, ntlmoptions))
     291
     292plansmbtorture4testsuite('rpc.echo', "ad_dc_ntvfs", ['ncacn_np:$SERVER[smb2]', '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.rpc.echo on ncacn_np over smb2")
     293
     294plansmbtorture4testsuite('ntp.signd', "ad_dc_ntvfs:local", ['ncacn_np:$SERVER', '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.ntp.signd")
     295
     296nbt_tests = smbtorture4_testsuites("nbt.")
     297for t in nbt_tests:
     298    plansmbtorture4testsuite(t, "ad_dc_ntvfs", "//$SERVER/_none_ -U\"$USERNAME%$PASSWORD\"")
    215299
    216300# Tests against the NTVFS POSIX backend
    217 ntvfsargs = ["--option=torture:sharedelay=10000", "--option=torture:oplocktimeout=3", "--option=torture:writetimeupdatedelay=50000"]
    218 
    219 smb2 = smb4torture_testsuites("smb2.")
     301ntvfsargs = ["--option=torture:sharedelay=100000", "--option=torture:oplocktimeout=3", "--option=torture:writetimeupdatedelay=500000"]
     302
     303# smb2.change_notify_disabled must only run against env fileserver-notify-disabled
     304smb2 = filter(lambda x: "smb2.change_notify_disabled" not in x, smbtorture4_testsuites("smb2."))
     305
    220306#The QFILEINFO-IPC test needs to be on ipc$
    221 raw = filter(lambda x: "raw.qfileinfo.ipc" not in x, smb4torture_testsuites("raw."))
    222 base = smb4torture_testsuites("base.")
    223 
    224 for t in base + raw + smb2:
    225     plansmbtorturetestsuite(t, "dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD' + " " + " ".join(ntvfsargs))
    226 
    227 plansmbtorturetestsuite("raw.qfileinfo.ipc", "dc", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
    228 
    229 for t in smb4torture_testsuites("rap."):
    230     plansmbtorturetestsuite(t, "dc", '//$SERVER/IPC\$ -U$USERNAME%$PASSWORD')
     307raw = filter(lambda x: "raw.qfileinfo.ipc" not in x, smbtorture4_testsuites("raw."))
     308base = smbtorture4_testsuites("base.")
     309
     310netapi = smbtorture4_testsuites("netapi.")
     311
     312libsmbclient = smbtorture4_testsuites("libsmbclient.")
     313
     314for t in base + raw + smb2 + netapi + libsmbclient:
     315    plansmbtorture4testsuite(t, "ad_dc_ntvfs", ['//$SERVER/tmp', '-U$USERNAME%$PASSWORD'] + ntvfsargs)
     316
     317plansmbtorture4testsuite("raw.qfileinfo.ipc", "ad_dc_ntvfs", '//$SERVER/ipc\$ -U$USERNAME%$PASSWORD')
     318
     319for t in smbtorture4_testsuites("rap."):
     320    plansmbtorture4testsuite(t, "ad_dc_ntvfs", '//$SERVER/IPC\$ -U$USERNAME%$PASSWORD')
    231321
    232322# Tests against the NTVFS CIFS backend
    233323for t in base + raw:
    234     plantestsuite_loadlist("samba4.ntvfs.cifs.%s" % t, "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/cifs', '-U$USERNAME%$PASSWORD'] + ntvfsargs + [t])
    235 
    236 plansmbtorturetestsuite('echo.udp', 'dc:local', '//$SERVER/whatever')
     324    plansmbtorture4testsuite(t, "ad_dc_ntvfs", ['//$NETBIOSNAME/cifs', '-U$USERNAME%$PASSWORD', '--kerberos=yes'] + ntvfsargs, modname="samba4.ntvfs.cifs.krb5.%s" % t)
     325
     326# Test NTVFS CIFS backend with S4U2Self and S4U2Proxy
     327t = "base.unlink"
     328plansmbtorture4testsuite(t, "ad_dc_ntvfs", ['//$NETBIOSNAME/cifs', '-U$USERNAME%$PASSWORD', '--kerberos=no'] + ntvfsargs, "samba4.ntvfs.cifs.ntlm.%s" % t)
     329plansmbtorture4testsuite(t, "rpc_proxy", ['//$NETBIOSNAME/cifs_to_dc', '-U$DC_USERNAME%$DC_PASSWORD', '--kerberos=yes'] + ntvfsargs, "samba4.ntvfs.cifs.krb5.%s" % t)
     330plansmbtorture4testsuite(t, "rpc_proxy", ['//$NETBIOSNAME/cifs_to_dc', '-U$DC_USERNAME%$DC_PASSWORD', '--kerberos=no'] + ntvfsargs, "samba4.ntvfs.cifs.ntlm.%s" % t)
     331
     332plansmbtorture4testsuite('echo.udp', 'ad_dc_ntvfs:local', '//$SERVER/whatever')
    237333
    238334# Local tests
    239 for t in smb4torture_testsuites("local."):
    240     plansmbtorturetestsuite(t, "none", "ncalrpc:")
     335for t in smbtorture4_testsuites("local."):
     336    #The local.resolve test needs a name to look up using real system (not emulated) name routines
     337    plansmbtorture4testsuite(t, "none", "ncalrpc:localhost")
     338
     339# Confirm these tests with the system iconv too
     340for t in ["local.convert_string_handle", "local.convert_string", "local.ndr"]:
     341    options = "ncalrpc: --option='iconv:use_builtin_handlers=false'"
     342    plansmbtorture4testsuite(t, "none", options,
     343        modname="samba4.%s.system.iconv" % t)
    241344
    242345tdbtorture4 = binpath("tdbtorture")
     
    246349    skiptestsuite("tdb.stress", "Using system TDB, tdbtorture not available")
    247350
    248 plansmbtorturetestsuite("drs.unit", "none", "ncalrpc:")
     351plansmbtorture4testsuite("drs.unit", "none", "ncalrpc:")
    249352
    250353# Pidl tests
     
    252355    if f.endswith(".pl"):
    253356        planperltestsuite("pidl.%s" % f[:-3], os.path.normpath(os.path.join(samba4srcdir, "../pidl/tests", f)))
    254 planperltestsuite("selftest.samba4", os.path.normpath(os.path.join(samba4srcdir, "../selftest/test_samba4.pl")))
     357
     358# DNS tests
     359plantestsuite_loadlist("samba.tests.dns", "fl2003dc:local", [python, os.path.join(srcdir(), "python/samba/tests/dns.py"), '$SERVER', '$SERVER_IP', '--machine-pass', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
     360
     361for t in smbtorture4_testsuites("dns_internal."):
     362    plansmbtorture4testsuite(t, "ad_dc_ntvfs:local", '//$SERVER/whavever')
     363
     364# Local tests
     365for t in smbtorture4_testsuites("dlz_bind9."):
     366    #The dlz_bind9 tests needs to look at the DNS database
     367    plansmbtorture4testsuite(t, "chgdcpass:local", ["ncalrpc:$SERVER", '-U$USERNAME%$PASSWORD'])
     368
     369planpythontestsuite("nt4_dc", "samba.tests.libsmb_samba_internal");
    255370
    256371# Blackbox Tests:
     
    259374# work correctly.
    260375
    261 planpythontestsuite("none", "samba.tests.blackbox.ndrdump")
    262 plantestsuite("samba4.blackbox.samba_tool(dc:local)", "dc:local", [os.path.join(samba4srcdir, "utils/tests/test_samba_tool.sh"),  '$SERVER', "$USERNAME", "$PASSWORD", "$DOMAIN"])
    263 plantestsuite("samba4.blackbox.pkinit(dc:local)", "dc:local", [os.path.join(bbdir, "test_pkinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", configuration])
    264 plantestsuite("samba4.blackbox.kinit(dc:local)", "dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", configuration])
    265 plantestsuite("samba4.blackbox.kinit(fl2000dc:local)", "fl2000dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "arcfour-hmac-md5", configuration])
    266 plantestsuite("samba4.blackbox.kinit(fl2008r2dc:local)", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", configuration])
    267 plantestsuite("samba4.blackbox.ktpass(dc)", "dc", [os.path.join(bbdir, "test_ktpass.sh"), '$PREFIX'])
    268 plantestsuite("samba4.blackbox.passwords(dc:local)", "dc:local", [os.path.join(bbdir, "test_passwords.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX"])
    269 plantestsuite("samba4.blackbox.export.keytab(dc:local)", "dc:local", [os.path.join(bbdir, "test_export_keytab.sh"), '$SERVER', '$USERNAME', '$REALM', '$DOMAIN', "$PREFIX"])
    270 plantestsuite("samba4.blackbox.cifsdd(dc)", "dc", [os.path.join(samba4srcdir, "client/tests/test_cifsdd.sh"), '$SERVER', '$USERNAME', '$PASSWORD', "$DOMAIN"])
    271 plantestsuite("samba4.blackbox.nmblookup(dc)", "dc", [os.path.join(samba4srcdir, "utils/tests/test_nmblookup.sh"), '$NETBIOSNAME', '$NETBIOSALIAS', '$SERVER', '$SERVER_IP'])
    272 plantestsuite("samba4.blackbox.nmblookup(member)", "member", [os.path.join(samba4srcdir, "utils/tests/test_nmblookup.sh"), '$NETBIOSNAME', '$NETBIOSALIAS', '$SERVER', '$SERVER_IP'])
    273 plantestsuite("samba4.blackbox.locktest(dc)", "dc", [os.path.join(samba4srcdir, "torture/tests/test_locktest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', '$PREFIX'])
    274 plantestsuite("samba4.blackbox.masktest", "dc", [os.path.join(samba4srcdir, "torture/tests/test_masktest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', '$PREFIX'])
    275 plantestsuite("samba4.blackbox.gentest(dc)", "dc", [os.path.join(samba4srcdir, "torture/tests/test_gentest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', "$PREFIX"])
    276 plantestsuite("samba4.blackbox.wbinfo(dc:local)", "dc:local", [os.path.join(samba4srcdir, "../nsswitch/tests/test_wbinfo.sh"), '$DOMAIN', '$USERNAME', '$PASSWORD', "dc"])
    277 plantestsuite("samba4.blackbox.wbinfo(member:local)", "member:local", [os.path.join(samba4srcdir, "../nsswitch/tests/test_wbinfo.sh"), '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', "member"])
    278 plantestsuite("samba4.blackbox.chgdcpass(dc)", "dc", [os.path.join(bbdir, "test_chgdcpass.sh"), '$SERVER', "LOCALDC\$", '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", '$SELFTEST_PREFIX/dc'])
     376for env in ["ad_member", "s4member", "ad_dc_ntvfs", "chgdcpass"]:
     377    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])
     378
     379plantestsuite("samba4.blackbox.samba_tool(ad_dc_ntvfs:local)", "ad_dc_ntvfs:local", [os.path.join(samba4srcdir, "utils/tests/test_samba_tool.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', smbclient4])
     380
     381if have_heimdal_support:
     382    plantestsuite("samba4.blackbox.pkinit(ad_dc_ntvfs:local)", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_pkinit_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX/ad_dc_ntvfs', "aes256-cts-hmac-sha1-96", smbclient4, configuration])
     383    plantestsuite("samba4.blackbox.kinit(ad_dc_ntvfs:local)", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_kinit_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", smbclient4, configuration])
     384    plantestsuite("samba4.blackbox.kinit(fl2000dc:local)", "fl2000dc:local", [os.path.join(bbdir, "test_kinit_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "arcfour-hmac-md5", smbclient4, configuration])
     385    plantestsuite("samba4.blackbox.kinit(fl2008r2dc:local)", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", smbclient4, configuration])
     386    plantestsuite("samba4.blackbox.kinit_trust(fl2008r2dc:local)", "fl2008r2dc:local", [os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "forest", "aes256-cts-hmac-sha1-96"])
     387    plantestsuite("samba4.blackbox.kinit_trust(fl2003dc:local)", "fl2003dc:local", [os.path.join(bbdir, "test_kinit_trusts_heimdal.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "external", "arcfour-hmac-md5"])
     388
     389plantestsuite("samba4.blackbox.trust_utils(fl2008r2dc:local)", "fl2008r2dc:local", [os.path.join(bbdir, "test_trust_utils.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "forest"])
     390plantestsuite("samba4.blackbox.trust_utils(fl2003dc:local)", "fl2003dc:local", [os.path.join(bbdir, "test_trust_utils.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', '$TRUST_SERVER', '$TRUST_USERNAME', '$TRUST_PASSWORD', '$TRUST_REALM', '$TRUST_DOMAIN', '$PREFIX', "external"])
     391plantestsuite("samba4.blackbox.ktpass(ad_dc_ntvfs)", "ad_dc_ntvfs", [os.path.join(bbdir, "test_ktpass.sh"), '$PREFIX/ad_dc_ntvfs'])
     392plantestsuite("samba4.blackbox.passwords(ad_dc_ntvfs:local)", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_passwords.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$REALM', '$DOMAIN', "$PREFIX/ad_dc_ntvfs", smbclient4])
     393plantestsuite("samba4.blackbox.export.keytab(ad_dc_ntvfs:local)", "ad_dc_ntvfs:local", [os.path.join(bbdir, "test_export_keytab.sh"), '$SERVER', '$USERNAME', '$REALM', '$DOMAIN', "$PREFIX", smbclient4])
     394plantestsuite("samba4.blackbox.cifsdd(ad_dc_ntvfs)", "ad_dc_ntvfs", [os.path.join(samba4srcdir, "client/tests/test_cifsdd.sh"), '$SERVER', '$USERNAME', '$PASSWORD', "$DOMAIN"])
     395plantestsuite("samba4.blackbox.nmblookup(ad_dc_ntvfs)", "ad_dc_ntvfs", [os.path.join(samba4srcdir, "utils/tests/test_nmblookup.sh"), '$NETBIOSNAME', '$NETBIOSALIAS', '$SERVER', '$SERVER_IP', nmblookup4])
     396plantestsuite("samba4.blackbox.locktest(ad_dc_ntvfs)", "ad_dc_ntvfs", [os.path.join(samba4srcdir, "torture/tests/test_locktest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', '$PREFIX'])
     397plantestsuite("samba4.blackbox.masktest", "ad_dc_ntvfs", [os.path.join(samba4srcdir, "torture/tests/test_masktest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', '$PREFIX'])
     398plantestsuite("samba4.blackbox.gentest(ad_dc_ntvfs)", "ad_dc_ntvfs", [os.path.join(samba4srcdir, "torture/tests/test_gentest.sh"), '$SERVER', '$USERNAME', '$PASSWORD', '$DOMAIN', "$PREFIX"])
     399plantestsuite("samba4.blackbox.rfc2307_mapping(ad_dc_ntvfs:local)", "ad_dc_ntvfs:local", [os.path.join(samba4srcdir, "../nsswitch/tests/test_rfc2307_mapping.sh"), '$DOMAIN', '$USERNAME', '$PASSWORD', "$SERVER", "$UID_RFC2307TEST", "$GID_RFC2307TEST", configuration])
     400plantestsuite("samba4.blackbox.chgdcpass", "chgdcpass", [os.path.join(bbdir, "test_chgdcpass.sh"), '$SERVER', "CHGDCPASS\$", '$REALM', '$DOMAIN', '$PREFIX', "aes256-cts-hmac-sha1-96", '$SELFTEST_PREFIX/chgdcpass', smbclient4])
     401plantestsuite("samba4.blackbox.samba_upgradedns(chgdcpass:local)", "chgdcpass:local", [os.path.join(bbdir, "test_samba_upgradedns.sh"), '$SERVER', '$REALM', '$PREFIX', '$SELFTEST_PREFIX/chgdcpass'])
     402plantestsuite("samba4.blackbox.net_ads(ad_member:local)", "ad_member:local", [os.path.join(bbdir, "test_net_ads.sh"), '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD'])
     403plantestsuite_loadlist("samba4.rpc.echo against NetBIOS alias", "ad_dc_ntvfs", [valgrindify(smbtorture4), "$LISTOPT", "$LOADLIST", 'ncacn_np:$NETBIOSALIAS', '-U$DOMAIN/$USERNAME%$PASSWORD', 'rpc.echo'])
    279404
    280405# Tests using the "Simple" NTVFS backend
    281406for t in ["base.rw1"]:
    282     plantestsuite_loadlist("samba4.ntvfs.simple.%s" % t, "dc", [valgrindify(smb4torture), "$LISTOPT", "//$SERVER/simple", '-U$USERNAME%$PASSWORD', t])
    283 
    284 # Domain Member Tests
    285 plantestsuite_loadlist("samba4.rpc.echo against member server with local creds", "member", [valgrindify(smb4torture), "$LISTOPT", 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'rpc.echo'])
    286 plantestsuite_loadlist("samba4.rpc.echo against member server with domain creds", "member", [valgrindify(smb4torture), "$LISTOPT", 'ncacn_np:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD', 'rpc.echo'])
    287 plantestsuite_loadlist("samba4.rpc.samr against member server with local creds", "member", [valgrindify(smb4torture), "$LISTOPT", 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "rpc.samr"])
    288 plantestsuite_loadlist("samba4.rpc.samr.users against member server with local creds", "member", [valgrindify(smb4torture), "$LISTOPT", 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "rpc.samr.users"])
    289 plantestsuite_loadlist("samba4.rpc.samr.passwords against member server with local creds", "member", [valgrindify(smb4torture), "$LISTOPT", 'ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD', "rpc.samr.passwords"])
    290 plantestsuite("samba4.blackbox.smbclient against member server with local creds", "member", [os.path.join(samba4srcdir, "client/tests/test_smbclient.sh"), '$NETBIOSNAME', '$USERNAME', '$PASSWORD', '$NETBIOSNAME', '$PREFIX'])
     407    plansmbtorture4testsuite(t, "ad_dc_ntvfs", ["//$SERVER/simple", '-U$USERNAME%$PASSWORD'], modname="samba4.ntvfs.simple.%s" % t)
     408
     409# Domain S4member Tests
     410plansmbtorture4testsuite('rpc.echo', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD'], "samba4.rpc.echo against s4member server with local creds")
     411plansmbtorture4testsuite('rpc.echo', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'], "samba4.rpc.echo against s4member server with domain creds")
     412plansmbtorture4testsuite('rpc.samr', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD'], "samba4.rpc.samr against s4member server with local creds")
     413plansmbtorture4testsuite('rpc.samr.users', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD'], "samba4.rpc.samr.users against s4member server with local creds",)
     414plansmbtorture4testsuite('rpc.samr.passwords', "s4member", ['ncacn_np:$NETBIOSNAME', '-U$NETBIOSNAME/$USERNAME%$PASSWORD'], "samba4.rpc.samr.passwords against s4member server with local creds")
     415plantestsuite("samba4.blackbox.smbclient against s4member server with local creds", "s4member", [os.path.join(samba4srcdir, "client/tests/test_smbclient.sh"), '$NETBIOSNAME', '$USERNAME', '$PASSWORD', '$NETBIOSNAME', '$PREFIX', smbclient4])
    291416
    292417# RPC Proxy
    293 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"])
     418plansmbtorture4testsuite("rpc.echo", "rpc_proxy", ['ncacn_ip_tcp:$NETBIOSNAME', '-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'], modname="samba4.rpc.echo against rpc proxy with domain creds")
    294419
    295420# Tests SMB signing
     
    303428        signoptions = "%s %s" % (mech, signing)
    304429        name = "smb.signing on with %s" % signoptions
    305         plantestsuite_loadlist("samba4.%s" % name, "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy'])
     430        plansmbtorture4testsuite('base.xcopy', "ad_dc_ntvfs", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$USERNAME%$PASSWORD'], modname="samba4.%s" % name)
    306431
    307432for mech in [
     
    309434    "-k no --option=usespnego=no",
    310435    "-k no --option=gensec:spengo=no",
    311     "-k yes",
    312     "-k yes --option=gensec:fake_gssapi_krb5=yes --option=gensec:gssapi_krb5=no"]:
     436    "-k yes"]:
    313437    signoptions = "%s --signing=off" % mech
    314     name = "smb.signing on with %s" % signoptions
    315     plantestsuite_loadlist("samba4.%s domain-creds" % name, "member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
    316 
     438    name = "smb.signing disabled on with %s" % signoptions
     439    plansmbtorture4testsuite('base.xcopy', "s4member", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s domain-creds" % name)
     440    plansmbtorture4testsuite('base.xcopy', "ad_member", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s domain-creds" % name)
     441    plansmbtorture4testsuite('base.xcopy', "ad_dc", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$USERNAME%$PASSWORD'], "samba4.%s" % name)
     442    plansmbtorture4testsuite('base.xcopy', "ad_dc",
     443                            ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$DC_USERNAME%$DC_PASSWORD'], "samba4.%s administrator" % name)
     444
     445plantestsuite("samba4.blackbox.bogusdomain", "ad_member", ["testprogs/blackbox/bogus.sh", "$NETBIOSNAME", "xcopy_share", '$USERNAME', '$PASSWORD', '$DC_USERNAME', '$DC_PASSWORD', smbclient4])
    317446for mech in [
    318447    "-k no",
     
    320449    "-k no --option=gensec:spengo=no"]:
    321450    signoptions = "%s --signing=off" % mech
    322     name = "smb.signing on with %s" % signoptions
    323     plantestsuite_loadlist("samba4.%s local-creds" % name, "member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'base.xcopy'])
    324 plantestsuite_loadlist("samba4.smb.signing --signing=yes anon", "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=yes', '-U%', 'base.xcopy'])
    325 plantestsuite_loadlist("samba4.smb.signing --signing=required anon", "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=required', '-U%', 'base.xcopy'])
    326 plantestsuite_loadlist("samba4.smb.signing --signing=no anon", "member",  [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=no', '-U%', 'base.xcopy'])
    327 
    328 nbt_tests = smb4torture_testsuites("nbt.")
    329 for t in nbt_tests:
    330     plansmbtorturetestsuite(t, "dc", "//$SERVER/_none_ -U\"$USERNAME%$PASSWORD\"")
    331 
    332 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\""]
    333 
    334 winbind_struct_tests = smb4torture_testsuites("winbind.struct")
    335 winbind_ndr_tests = smb4torture_testsuites("winbind.ndr")
    336 for env in ["dc", "member"]:
    337     for t in winbind_struct_tests:
    338         plansmbtorturetestsuite(t, env, "%s //_none_/_none_" % " ".join(wb_opts))
    339 
    340     for t in winbind_ndr_tests:
    341         plansmbtorturetestsuite(t, env, "%s //_none_/_none_" % " ".join(wb_opts))
     451    plansmbtorture4testsuite('base.xcopy', "s4member", ['//$NETBIOSNAME/xcopy_share', signoptions, '-U$NETBIOSNAME/$USERNAME%$PASSWORD'], modname="samba4.smb.signing on with %s local-creds" % signoptions)
     452
     453plansmbtorture4testsuite('base.xcopy', "ad_dc_ntvfs", ['//$NETBIOSNAME/xcopy_share', '-k', 'no', '--signing=yes', '-U%'], modname="samba4.smb.signing --signing=yes anon")
     454plansmbtorture4testsuite('base.xcopy', "ad_dc_ntvfs", ['//$NETBIOSNAME/xcopy_share', '-k', 'no', '--signing=required', '-U%'], modname="samba4.smb.signing --signing=required anon")
     455plansmbtorture4testsuite('base.xcopy', "s4member", ['//$NETBIOSNAME/xcopy_share', '-k', 'no', '--signing=no', '-U%'], modname="samba4.smb.signing --signing=no anon")
     456
     457
     458wb_opts_default = ["--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\""]
     459
     460winbind_ad_client_tests = smbtorture4_testsuites("winbind.struct") + smbtorture4_testsuites("winbind.pac")
     461winbind_wbclient_tests = smbtorture4_testsuites("winbind.wbclient")
     462for env in ["ad_dc", "ad_dc_ntvfs", "s4member", "ad_member", "nt4_member"]:
     463    wb_opts = wb_opts_default[:]
     464    if env in ["ad_member"]:
     465        wb_opts += ["--option=\"torture:winbindd_domain_without_prefix=$DOMAIN\""]
     466    for t in winbind_ad_client_tests:
     467        plansmbtorture4testsuite(t, "%s:local" % env, wb_opts + ['//$SERVER/tmp', '--realm=$REALM', '--machine-pass', '--option=torture:addc=$DC_SERVER'])
     468
     469for env in ["nt4_dc", "fl2003dc"]:
     470    for t in winbind_wbclient_tests:
     471        plansmbtorture4testsuite(t, "%s:local" % env, '//$SERVER/tmp -U$DC_USERNAME%$DC_PASSWORD')
     472
     473for env in ["nt4_dc", "nt4_member", "ad_dc", "ad_dc_ntvfs", "ad_member", "s4member", "chgdcpass"]:
     474    tests = ["--ping", "--separator",
     475             "--own-domain",
     476             "--all-domains",
     477             "--trusted-domains",
     478             "--domain-info=BUILTIN",
     479             "--domain-info=$DOMAIN",
     480             "--online-status",
     481             "--online-status --domain=BUILTIN",
     482             "--online-status --domain=$DOMAIN",
     483             "--check-secret --domain=$DOMAIN",
     484             "--change-secret --domain=$DOMAIN",
     485             "--check-secret --domain=$DOMAIN",
     486             "--online-status --domain=$DOMAIN",
     487             "--domain-users",
     488             "--domain-groups",
     489             "--name-to-sid=$DC_USERNAME",
     490             "--name-to-sid=$DOMAIN/$DC_USERNAME",
     491             "--user-info=$DOMAIN/$DC_USERNAME",
     492             "--user-groups=$DOMAIN/$DC_USERNAME",
     493             "--authenticate=$DOMAIN/$DC_USERNAME%$DC_PASSWORD",
     494             "--allocate-uid",
     495             "--allocate-gid"]
     496
     497    for t in tests:
     498        plantestsuite("samba.wbinfo_simple.(%s:local).%s" % (env, t), "%s:local" % env, [os.path.join(srcdir(), "nsswitch/tests/test_wbinfo_simple.sh"), t])
     499
     500    plantestsuite(
     501        "samba.wbinfo_sids2xids.(%s:local)" % env, "%s:local" % env,
     502        [os.path.join(samba3srcdir, "script/tests/test_wbinfo_sids2xids.sh")])
     503
     504    plantestsuite(
     505        "samba.ntlm_auth.diagnostics(%s:local)" % env, "%s:local" % env,
     506        [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_diagnostics.sh"), ntlm_auth3, '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration])
     507
     508    plantestsuite("samba.ntlm_auth.(%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_s3.sh"), valgrindify(python), samba3srcdir, ntlm_auth3,  '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration])
     509
    342510
    343511nsstest4 = binpath("nsstest")
    344 if os.path.exists(nsstest4):
    345     plantestsuite("samba4.nss.test using winbind(member)", "member", [valgrindify(nsstest4), os.path.join(samba4bindir, "shared/libnss_winbind.so")])
    346 else:
    347     skiptestsuite("samba4.nss.test using winbind(member)", "nsstest not available")
     512for env in ["ad_dc:local", "ad_dc_ntvfs:local", "s4member:local", "nt4_dc:local", "ad_member:local", "nt4_member:local"]:
     513    if os.path.exists(nsstest4):
     514        plantestsuite("samba.nss.test using winbind(%s)" % env, env, [os.path.join(bbdir, "nsstest.sh"), nsstest4, os.path.join(samba4bindir, "shared/libnss_wrapper_winbind.so.2")])
     515    else:
     516        skiptestsuite("samba.nss.test using winbind(%s)" % env, "nsstest not available")
    348517
    349518subunitrun = valgrindify(python) + " " + os.path.join(samba4srcdir, "scripting/bin/subunitrun")
    350 def plansambapythontestsuite(name, env, path, module, environ={}, extra_args=[]):
     519def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, extra_args=[]):
    351520    environ = dict(environ)
    352     environ["PYTHONPATH"] = "$PYTHONPATH:" + path
     521    py_path = list(extra_path)
     522    if py_path:
     523        environ["PYTHONPATH"] = ":".join(["$PYTHONPATH"] + py_path)
    353524    args = ["%s=%s" % item for item in environ.iteritems()]
    354     args += [subunitrun, "$LISTOPT", module]
     525    args += [subunitrun, "$LISTOPT", "$LOADLIST", module]
    355526    args += extra_args
    356     plantestsuite(name, env, args)
    357 
    358 
    359 plansambapythontestsuite("ldb.python", "none", "%s/lib/ldb/tests/python/" % samba4srcdir, 'api')
    360 planpythontestsuite("none", "samba.tests.credentials")
    361 plantestsuite_idlist("samba.tests.gensec", "dc:local", [subunitrun, "$LISTOPT", '-U"$USERNAME%$PASSWORD"', "samba.tests.gensec"])
    362 planpythontestsuite("none", "samba.tests.registry")
    363 plansambapythontestsuite("tdb.python", "none", "%s/lib/tdb/python/tests" % srcdir(), 'simple')
    364 planpythontestsuite("none", "samba.tests.auth")
    365 planpythontestsuite("none", "samba.tests.security")
    366 planpythontestsuite("none", "samba.tests.dcerpc.misc")
    367 planpythontestsuite("none", "samba.tests.param")
    368 planpythontestsuite("none", "samba.tests.upgrade")
    369 planpythontestsuite("none", "samba.tests.core")
    370 planpythontestsuite("none", "samba.tests.provision")
    371 planpythontestsuite("none", "samba.tests.samba3")
    372 planpythontestsuite("dc:local", "samba.tests.dcerpc.sam")
    373 planpythontestsuite("dc:local", "samba.tests.dsdb")
    374 planpythontestsuite("none", "samba.tests.netcmd")
    375 planpythontestsuite("dc:local", "samba.tests.dcerpc.bare")
    376 planpythontestsuite("dc:local", "samba.tests.dcerpc.unix")
    377 planpythontestsuite("none", "samba.tests.dcerpc.rpc_talloc")
    378 planpythontestsuite("none", "samba.tests.samdb")
    379 planpythontestsuite("none", "samba.tests.hostconfig")
    380 planpythontestsuite("none", "samba.tests.messaging")
    381 planpythontestsuite("none", "samba.tests.samba3sam")
    382 planpythontestsuite("none", "subunit")
    383 planpythontestsuite("dc:local", "samba.tests.dcerpc.rpcecho")
    384 plantestsuite_idlist("samba.tests.dcerpc.registry", "dc:local", [subunitrun, "$LISTOPT", '-U"$USERNAME%$PASSWORD"', "samba.tests.dcerpc.registry"])
    385 plantestsuite("samba4.ldap.python(dc)", "dc", [python, os.path.join(samba4srcdir, "dsdb/tests/python/ldap.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '-W', '$DOMAIN'])
    386 plantestsuite("samba4.tokengroups.python(dc)", "dc:local", [python, os.path.join(samba4srcdir, "dsdb/tests/python/token_group.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '-W', '$DOMAIN'])
    387 plantestsuite("samba4.sam.python(dc)", "dc", [python, os.path.join(samba4srcdir, "dsdb/tests/python/sam.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '-W', '$DOMAIN'])
    388 plansambapythontestsuite("samba4.schemaInfo.python(dc)", "dc", os.path.join(samba4srcdir, 'dsdb/tests/python'), 'dsdb_schema_info', extra_args=['-U"$DOMAIN/$DC_USERNAME%$DC_PASSWORD"'])
    389 plantestsuite("samba4.urgent_replication.python(dc)", "dc", [python, os.path.join(samba4srcdir, "dsdb/tests/python/urgent_replication.py"), '$PREFIX_ABS/dc/private/sam.ldb'], allow_empty_output=True)
    390 for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
    391     plantestsuite("samba4.ldap_schema.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/ldap_schema.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '-W', '$DOMAIN'])
    392     plantestsuite("samba4.ldap.possibleInferiors.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/samdb/ldb_modules/tests/possibleinferiors.py"), "ldap://$SERVER", '-U"$USERNAME%$PASSWORD"', "-W", "$DOMAIN"])
    393     plantestsuite("samba4.ldap.secdesc.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/sec_descriptor.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '-W', '$DOMAIN'])
    394     plantestsuite("samba4.ldap.acl.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/acl.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '-W', '$DOMAIN'])
     527    if name is None:
     528        name = module
     529    plantestsuite_loadlist(name, env, args)
     530
     531planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.gensec", extra_args=['-U"$USERNAME%$PASSWORD"'])
     532planoldpythontestsuite("none", "simple", extra_path=["%s/lib/tdb/python/tests" % srcdir()], name="tdb.python")
     533planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.sam")
     534planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dsdb")
     535planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.bare")
     536planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.unix")
     537planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.srvsvc")
     538planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.timecmd")
     539
     540# We run this test against both AD DC implemetnations because it is
     541# the only test we have of GPO get/set behaviour, and this involves
     542# the file server as well as the LDAP server.
     543planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.gpo")
     544planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.gpo")
     545
     546planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.processes")
     547planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.user")
     548planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.group")
     549planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.ntacl")
     550
     551planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.sites")
     552
     553planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.rpcecho")
     554planoldpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.registry", extra_args=['-U"$USERNAME%$PASSWORD"'])
     555planoldpythontestsuite("ad_dc_ntvfs", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'])
     556planoldpythontestsuite("ad_dc", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'])
     557planoldpythontestsuite("ad_dc", "samba.tests.dcerpc.raw_protocol", extra_args=['-U"$USERNAME%$PASSWORD"'])
     558plantestsuite_loadlist("samba4.ldap.python(ad_dc_ntvfs)", "ad_dc_ntvfs", [python, os.path.join(samba4srcdir, "dsdb/tests/python/ldap.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
     559plantestsuite_loadlist("samba4.tokengroups.python(ad_dc_ntvfs)", "ad_dc_ntvfs:local", [python, os.path.join(samba4srcdir, "dsdb/tests/python/token_group.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
     560plantestsuite("samba4.sam.python(ad_dc_ntvfs)", "ad_dc_ntvfs", [python, os.path.join(samba4srcdir, "dsdb/tests/python/sam.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN'])
     561plantestsuite("samba4.user_account_control.python(ad_dc_ntvfs)", "ad_dc_ntvfs", [python, os.path.join(samba4srcdir, "dsdb/tests/python/user_account_control.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN'])
     562planoldpythontestsuite("ad_dc_ntvfs", "dsdb_schema_info",
     563        extra_path=[os.path.join(samba4srcdir, 'dsdb/tests/python')],
     564        name="samba4.schemaInfo.python(ad_dc_ntvfs)",
     565        extra_args=['-U"$DOMAIN/$DC_USERNAME%$DC_PASSWORD"'])
     566plantestsuite_loadlist("samba4.urgent_replication.python(ad_dc_ntvfs)", "ad_dc_ntvfs:local", [python, os.path.join(samba4srcdir, "dsdb/tests/python/urgent_replication.py"), '$PREFIX_ABS/ad_dc_ntvfs/private/sam.ldb', '$LOADLIST', '$LISTOPT'])
     567plantestsuite_loadlist("samba4.ldap.dirsync.python(ad_dc_ntvfs)", "ad_dc_ntvfs", [python, os.path.join(samba4srcdir, "dsdb/tests/python/dirsync.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
     568plantestsuite_loadlist("samba4.ldap.match_rules.python", "ad_dc_ntvfs", [python, os.path.join(srcdir(), "lib/ldb-samba/tests/match_rules.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
     569plantestsuite_loadlist("samba4.ldap.sites.python(ad_dc_ntvfs)", "ad_dc_ntvfs", [python, os.path.join(samba4srcdir, "dsdb/tests/python/sites.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
     570for env in ["ad_dc_ntvfs", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
     571    plantestsuite_loadlist("samba4.ldap_schema.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/ldap_schema.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
     572    plantestsuite("samba4.ldap.possibleInferiors.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/samdb/ldb_modules/tests/possibleinferiors.py"), "ldap://$SERVER", '-U"$USERNAME%$PASSWORD"', "-W$DOMAIN"])
     573    plantestsuite_loadlist("samba4.ldap.secdesc.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/sec_descriptor.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
     574    plantestsuite_loadlist("samba4.ldap.acl.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/acl.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
    395575    if env != "fl2000dc":
    396         # This test makes excessively use of the "userPassword" attribute which
     576        # This test makes excessive use of the "userPassword" attribute which
    397577        # isn't available on DCs with Windows 2000 domain function level -
    398578        # therefore skip it in that configuration
    399         plantestsuite("samba4.ldap.passwords.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/passwords.py"), "$SERVER", '-U"$USERNAME%$PASSWORD"', "-W", "$DOMAIN"])
    400 planpythontestsuite("dc:local", "samba.tests.upgradeprovisionneeddc")
    401 planpythontestsuite("none", "samba.tests.upgradeprovision")
    402 planpythontestsuite("none", "samba.tests.xattr")
    403 planpythontestsuite("none", "samba.tests.ntacls")
    404 plantestsuite("samba4.deletetest.python(dc)", "dc", ['PYTHONPATH="$PYTHONPATH:%s/lib/subunit/python:%s/lib/testtools"' % (srcdir(), srcdir()),
    405                                                      python, os.path.join(samba4srcdir, "dsdb/tests/python/deletetest.py"),
    406                                                      '$SERVER', '-U"$USERNAME%$PASSWORD"', '-W', '$DOMAIN'])
    407 plansambapythontestsuite("samba4.policy.python", "none", "%s/lib/policy/tests/python" % samba4srcdir, 'bindings')
    408 plantestsuite("samba4.blackbox.samba3dump", "none", [python, os.path.join(samba4srcdir, "scripting/bin/samba3dump"), os.path.join(samba4srcdir, "../testdata/samba3")], allow_empty_output=True)
    409 plantestsuite("samba4.blackbox.upgrade", "none", ["rm -rf $PREFIX/upgrade;", python, os.path.join(samba4srcdir, "setup/upgrade_from_s3"), "--targetdir=$PREFIX/upgrade", os.path.normpath(os.path.join(samba4srcdir, "../testdata/samba3")), os.path.normpath(os.path.join(samba4srcdir, "../testdata/samba3/smb.conf"))], allow_empty_output=True)
     579        plantestsuite_loadlist("samba4.ldap.passwords.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/passwords.py"), "$SERVER", '-U"$USERNAME%$PASSWORD"', "-W$DOMAIN", '$LOADLIST', '$LISTOPT'])
     580        plantestsuite_loadlist("samba4.ldap.password_lockout.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/password_lockout.py"), "$SERVER", '-U"$USERNAME%$PASSWORD"', "-W$DOMAIN", "--realm=$REALM", '$LOADLIST', '$LISTOPT'])
     581
     582planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.upgradeprovisionneeddc")
     583planpythontestsuite("ad_dc:local", "samba.tests.posixacl")
     584planpythontestsuite("ad_dc_no_nss:local", "samba.tests.posixacl")
     585plantestsuite_loadlist("samba4.deletetest.python(ad_dc_ntvfs)", "ad_dc_ntvfs", [python, os.path.join(samba4srcdir, "dsdb/tests/python/deletetest.py"),
     586                                                     '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
     587plantestsuite("samba4.blackbox.samba3dump", "none", [os.path.join(samba4srcdir, "selftest/test_samba3dump.sh")])
     588plantestsuite("samba4.blackbox.upgrade", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_s3upgrade.sh"), '$PREFIX/provision'])
    410589plantestsuite("samba4.blackbox.provision.py", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_provision.sh"), '$PREFIX/provision'])
    411 plantestsuite("samba4.blackbox.upgradeprovision.py", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_upgradeprovision.sh"), '$PREFIX/provision'])
     590plantestsuite("samba4.blackbox.upgradeprovision.current", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_upgradeprovision.sh"), '$PREFIX/provision'])
    412591plantestsuite("samba4.blackbox.setpassword.py", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_setpassword.sh"), '$PREFIX/provision'])
    413592plantestsuite("samba4.blackbox.newuser.py", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_newuser.sh"), '$PREFIX/provision'])
    414593plantestsuite("samba4.blackbox.group.py", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_group.sh"), '$PREFIX/provision'])
    415 plantestsuite("samba4.blackbox.spn.py(dc:local)", "dc:local", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_spn.sh"), '$PREFIX/dc'])
    416 plantestsuite("samba4.ldap.bind(dc)", "dc", [python, os.path.join(samba4srcdir, "auth/credentials/tests/bind.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"'])
    417 
    418 # DRS python tests
    419 plansambapythontestsuite("samba4.blackbox.samba-tool.drs(vampire_dc)", "vampire_dc", os.path.join(samba4srcdir, 'scripting/python'), "samba.tests.blackbox.samba_tool_drs", environ={'DC1': '$DC_SERVER', 'DC2': '$VAMPIRE_DC_SERVER'}, extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
    420 plansambapythontestsuite("samba4.drs.replica_sync.python(vampire_dc)", "vampire_dc", os.path.join(samba4srcdir, 'torture/drs/python'), "replica_sync", environ={'DC1': '$DC_SERVER', 'DC2': '$VAMPIRE_DC_SERVER'}, extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
    421 plansambapythontestsuite("samba4.drs.delete_object.python(vampire_dc)", "vampire_dc", os.path.join(samba4srcdir, 'torture/drs/python'), "delete_object", environ={'DC1': '$DC_SERVER', 'DC2': '$VAMPIRE_DC_SERVER'}, extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
    422 plansambapythontestsuite("samba4.drs.fsmo.python(vampire_dc)", "vampire_dc", os.path.join(samba4srcdir, 'torture/drs/python'), "fsmo", environ={'DC1': "$DC_SERVER", 'DC2': "$VAMPIRE_DC_SERVER"}, extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
    423 plansambapythontestsuite("samba4.drs.repl_schema.python(vampire_dc)", "vampire_dc", os.path.join(samba4srcdir, 'torture/drs/python'), "repl_schema", environ={'DC1': "$DC_SERVER", 'DC2': '$VAMPIRE_DC_SERVER'}, extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
     594plantestsuite("samba4.blackbox.spn.py(ad_dc_ntvfs:local)", "ad_dc_ntvfs:local", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_spn.sh"), '$PREFIX/ad_dc_ntvfs'])
     595plantestsuite_loadlist("samba4.ldap.bind(fl2008r2dc)", "fl2008r2dc", [python, os.path.join(srcdir(), "auth/credentials/tests/bind.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '$LOADLIST', '$LISTOPT'])
    424596
    425597# This makes sure we test the rid allocation code
    426598t = "rpc.samr.large-dc"
    427 plantestsuite_loadlist("samba4.%s.one" % t, "vampire_dc", [valgrindify(smb4torture), "$LISTOPT", '$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
    428 plantestsuite_loadlist("samba4.%s.two" % t, "vampire_dc", [valgrindify(smb4torture), "$LISTOPT", '$SERVER', '-U$USERNAME%$PASSWORD', '-W', '$DOMAIN', t])
     599plansmbtorture4testsuite(t, "vampire_dc", ['$SERVER', '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], modname=("samba4.%s.one" % t))
     600plansmbtorture4testsuite(t, "vampire_dc", ['$SERVER', '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], modname="samba4.%s.two" % t)
    429601
    430602# some RODC testing
    431 plantestsuite_loadlist("samba4.rpc.echo", "rodc", [smb4torture, "$LISTOPT", 'ncacn_np:$SERVER', "-k", "yes", '-U$USERNAME%$PASSWORD', '-W' '$DOMAIN', 'rpc.echo'])
    432 plantestsuite_loadlist("samba4.rpc.echo", "rodc:local", [smb4torture, "$LISTOPT", 'ncacn_np:$SERVER', "-k", "yes", '-P', '-W' '$DOMAIN', 'rpc.echo'])
    433 plantestsuite("samba4.blackbox.provision-backend.py", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_provision-backend.sh"), '$PREFIX/provision'])
     603for env in ['rodc']:
     604    plansmbtorture4testsuite('rpc.echo', env, ['ncacn_np:$SERVER', "-k", "yes", '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], modname="samba4.rpc.echo")
     605    plansmbtorture4testsuite('rpc.echo', "%s:local" % env, ['ncacn_np:$SERVER', "-k", "yes", '-P', '--workgroup=$DOMAIN'], modname="samba4.rpc.echo")
     606plantestsuite("samba4.blackbox.provision-backend", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_provision-backend.sh"), '$PREFIX/provision'])
     607
     608# Test renaming the DC
     609plantestsuite("samba4.blackbox.renamedc.sh", "none", ["PYTHON=%s" % python, os.path.join(bbdir, "renamedc.sh"), '$PREFIX/provision'])
     610
     611for env in ['vampire_dc', 'promoted_dc']:
     612
     613    # DRS python tests
     614    planoldpythontestsuite(env, "samba.tests.blackbox.samba_tool_drs",
     615                           environ={'DC1': '$DC_SERVER', 'DC2': '$%s_SERVER' % env.upper()},
     616                           extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
     617    planoldpythontestsuite("%s:local" % env, "replica_sync",
     618                           extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
     619                           name="samba4.drs.replica_sync.python(%s)" % env,
     620                           environ={'DC1': '$DC_SERVER', 'DC2': '$%s_SERVER' % env.upper()},
     621                           extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
     622    planoldpythontestsuite(env, "delete_object",
     623                           extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
     624                           name="samba4.drs.delete_object.python(%s)" % env,
     625                           environ={'DC1': '$DC_SERVER', 'DC2': '$%s_SERVER' % env.upper()},
     626                           extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
     627    planoldpythontestsuite(env, "fsmo",
     628                           name="samba4.drs.fsmo.python(%s)" % env,
     629                           extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
     630                           environ={'DC1': "$DC_SERVER", 'DC2': '$%s_SERVER' % env.upper()},
     631                           extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
     632    planoldpythontestsuite(env, "repl_schema",
     633                           extra_path=[os.path.join(samba4srcdir, 'torture/drs/python')],
     634                           name="samba4.drs.repl_schema.python(%s)" % env,
     635                           environ={'DC1': "$DC_SERVER", 'DC2': '$%s_SERVER' % env.upper()},
     636                           extra_args=['-U$DOMAIN/$DC_USERNAME%$DC_PASSWORD'])
     637
     638
     639for env in ["ad_dc_ntvfs", "s4member", "rodc", "promoted_dc", "ad_dc", "ad_member"]:
     640    plantestsuite("samba.blackbox.wbinfo(%s:local)" % env, "%s:local" % env, [os.path.join(samba4srcdir, "../nsswitch/tests/test_wbinfo.sh"), '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', env])
     641
     642for env in ["ad_dc_ntvfs", "rodc", "promoted_dc", "ad_dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
     643    if env == "rodc":
     644        extra_options = ['--option=torture:expect_rodc=true']
     645    else:
     646        extra_options = []
     647
     648    plansmbtorture4testsuite('krb5.kdc', env, ['ncacn_np:$SERVER_IP', "-k", "yes", '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--realm=$REALM'] + extra_options,
     649                             "samba4.krb5.kdc with specified account")
     650    plansmbtorture4testsuite('krb5.kdc', env, ['ncacn_np:$SERVER_IP', "-k", "yes", '-Utestdenied%$PASSWORD', '--workgroup=$DOMAIN', '--realm=$REALM', '--option=torture:krb5-upn=testdenied_upn@$REALM.upn'] + extra_options,
     651                             "samba4.krb5.kdc with account DENIED permission to replicate to an RODC")
     652
     653    # These last two tests are for users cached at the RODC
     654    if env == "rodc":
     655        extra_options = ['--option=torture:expect_rodc=true', '--option=torture:expect_cached_at_rodc=true']
     656    else:
     657        extra_options = []
     658
     659    plansmbtorture4testsuite('krb5.kdc', "%s:local" % env, ['ncacn_np:$SERVER_IP', "-k", "yes", '-P',
     660                                            '--workgroup=$DOMAIN', '--realm=$REALM',
     661                                            '--option=torture:krb5-hostname=$SERVER',
     662                                            '--option=torture:run_removedollar_test=true',
     663                                            '--option=torture:expect_machine_account=true'] + extra_options,
     664                             "samba4.krb5.kdc with machine account")
     665    plansmbtorture4testsuite('krb5.kdc', env, ['ncacn_np:$SERVER_IP', "-k", "yes", '-Utestallowed\ account%$PASSWORD',
     666                                               '--workgroup=$DOMAIN', '--realm=$REALM',
     667                                               '--option=torture:expect_machine_account=true',
     668                                               '--option=torture:krb5-upn=testallowed\ upn@$REALM',
     669                                               '--option=torture:krb5-hostname=testallowed'] + extra_options,
     670                             "samba4.krb5.kdc with account ALLOWED permission to replicate to an RODC")
     671
     672
     673for env in [
     674        'vampire_dc',
     675        'promoted_dc']:
     676    planoldpythontestsuite(env, "samba.tests.kcc",
     677                           name="samba.tests.kcc",
     678                           environ={'TEST_SERVER': '$SERVER', 'TEST_USERNAME': '$USERNAME',
     679                                    'TEST_PASSWORD': '$PASSWORD',
     680                                    'TEST_ENV': env
     681                                },
     682                           extra_path=[os.path.join(srcdir(), "samba/python"), ]
     683                           )
     684
     685# Demote the vampire DC, it must be the last test each DC, before the dbcheck
     686for env in ['vampire_dc', 'promoted_dc', 'rodc']:
     687    plantestsuite("samba4.blackbox.samba_tool_demote(%s)" % env, env, [os.path.join(samba4srcdir, "utils/tests/test_demote.sh"), '$SERVER', '$SERVER_IP', '$USERNAME', '$PASSWORD', '$DOMAIN', '$DC_SERVER', '$PREFIX/%s' % env, smbclient4])
     688
     689# TODO: Verifying the databases really should be a part of the
     690# environment teardown.
     691# check the databases are all OK. PLEASE LEAVE THIS AS THE LAST TEST
     692for env in ["ad_dc_ntvfs", "ad_dc", "fl2000dc", "fl2003dc", "fl2008r2dc", 'vampire_dc', 'promoted_dc']:
     693    plantestsuite("samba4.blackbox.dbcheck(%s)" % env, env + ":local" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck.sh"), '$PREFIX/provision', configuration])
Note: See TracChangeset for help on using the changeset viewer.