[SCM] Samba Shared Repository - branch master updated

Ralph Böhme slow at samba.org
Fri Dec 20 07:35:08 UTC 2019


The branch, master has been updated
       via  1cf2397226d selftest: don't use NTVFS fileserver in chgdcpass
       via  2e5188f520d selftest: don't use NTVFS fileserver in rodc
       via  629254ec5b0 selftest: don't use NTVFS fileserver in fl2008r2dc
       via  3518151cb24 selftest: don't use NTVFS fileserver in fl2003dc
       via  bd141ead0dd selftest: don't use NTVFS fileserver in fl2000dc
       via  fbcf1ab7087 selftest: don't use NTVFS fileserver in vampire_dc
       via  db24892d0e1 selftest: don't use NTVFS fileserver in promoted_dc
       via  01141d06af8 selftest: make fl2008dc an alias for ad_dc, not ad_dc_ntvfs
       via  bba0cafa951 selftest: make ad_dc_slowtests an alias for ad_dc, not ad_dc_ntvfs
       via  8d1206c9209 selftest: make ad_dc_default an alias for ad_dc, not ad_dc_ntvfs
       via  ac115db1fca selftest: run samba.tests.samba_tool.user against ad_dc_ntvfs:local explicitly
       via  f3f22851ff1 selftest: run samba.ldap.referrals against ad_dc_ntvfs explicitly
       via  0f5b66230d0 selftest: run samba4.ldap.dirsync.python against ad_dc_ntvfs explicitly
       via  88a381389c3 selftest: run samba.tests.dcerpc.srvsvc against ad_dc_ntvfs explicitly
       via  7974e55024f selftest: run rpc.srvsvc and rpc.mgmt against ad_dc_ntvfs explicitly
       via  9174968b015 selftest: hardcode ad_dc_ntvfs for the rpc.netlogon testsuite
       via  2d2809be7b1 selftest: make testenv name logic more flexible for the rpc testcases
       via  c20179a4f86 selftest: use ad_dc_ntvfs env instead of ad_dc_default for samba4.ldb.ldaps
      from  8b04590e4d8 libsmbclient: If over SMB1 first try to do a posix stat on the file.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1cf2397226d1ba6d0ff91c58da77b989e30b0420
Author: Ralph Boehme <slow at samba.org>
Date:   Tue Nov 26 09:50:48 2019 +0100

    selftest: don't use NTVFS fileserver in chgdcpass
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Fri Dec 20 07:34:42 UTC 2019 on sn-devel-184

commit 2e5188f520d0d452c7ac211ef7cf2791a320ec1f
Author: Ralph Boehme <slow at samba.org>
Date:   Tue Nov 26 09:50:48 2019 +0100

    selftest: don't use NTVFS fileserver in rodc
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 629254ec5b0d60a342f071aa1e67c22822d940a4
Author: Ralph Boehme <slow at samba.org>
Date:   Tue Nov 26 09:50:48 2019 +0100

    selftest: don't use NTVFS fileserver in fl2008r2dc
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 3518151cb2474ff9000b87e9f08d13290adfadae
Author: Ralph Boehme <slow at samba.org>
Date:   Tue Nov 26 09:50:48 2019 +0100

    selftest: don't use NTVFS fileserver in fl2003dc
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit bd141ead0dd238834aa13f0801463de8563f1dde
Author: Ralph Boehme <slow at samba.org>
Date:   Tue Nov 26 09:50:48 2019 +0100

    selftest: don't use NTVFS fileserver in fl2000dc
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit fbcf1ab7087e6d80aa1336aa0cad5c6e7fec62ee
Author: Ralph Boehme <slow at samba.org>
Date:   Tue Nov 26 09:50:48 2019 +0100

    selftest: don't use NTVFS fileserver in vampire_dc
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit db24892d0e1f5b87dc1b4fb297fde07c919f1dfb
Author: Ralph Boehme <slow at samba.org>
Date:   Tue Nov 26 09:50:48 2019 +0100

    selftest: don't use NTVFS fileserver in promoted_dc
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 01141d06af858cefdd9a98364122a923cbd312b3
Author: Ralph Boehme <slow at samba.org>
Date:   Mon Nov 25 13:03:28 2019 +0100

    selftest: make fl2008dc an alias for ad_dc, not ad_dc_ntvfs
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit bba0cafa951eee2cbe3a0e87e486c600a24818db
Author: Ralph Boehme <slow at samba.org>
Date:   Mon Nov 25 13:03:28 2019 +0100

    selftest: make ad_dc_slowtests an alias for ad_dc, not ad_dc_ntvfs
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 8d1206c92094fce98d42d379bcd07275a51fd50c
Author: Ralph Boehme <slow at samba.org>
Date:   Tue Nov 26 13:32:04 2019 +0100

    selftest: make ad_dc_default an alias for ad_dc, not ad_dc_ntvfs
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit ac115db1fcaae7913dd1e62a5558272e235264e6
Author: Ralph Boehme <slow at samba.org>
Date:   Mon Nov 25 17:43:37 2019 +0100

    selftest: run samba.tests.samba_tool.user against ad_dc_ntvfs:local explicitly
    
    No change in behaviour.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit f3f22851ff12014452202c1eba4d96ac8db33645
Author: Ralph Boehme <slow at samba.org>
Date:   Mon Nov 25 16:52:41 2019 +0100

    selftest: run samba.ldap.referrals against ad_dc_ntvfs explicitly
    
    No change in behaviour.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 0f5b66230d08f27af0ae6f53038271462053ab25
Author: Ralph Boehme <slow at samba.org>
Date:   Mon Nov 25 16:52:29 2019 +0100

    selftest: run samba4.ldap.dirsync.python against ad_dc_ntvfs explicitly
    
    No change in behaviour.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 88a381389c370b697d194c1217d1609bea854c23
Author: Ralph Boehme <slow at samba.org>
Date:   Mon Nov 25 16:49:34 2019 +0100

    selftest: run samba.tests.dcerpc.srvsvc against ad_dc_ntvfs explicitly
    
    No change in behaviour.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 7974e55024f9d0479a375ffc990293941ff90303
Author: Ralph Boehme <slow at samba.org>
Date:   Mon Nov 25 16:14:49 2019 +0100

    selftest: run rpc.srvsvc and rpc.mgmt against ad_dc_ntvfs explicitly
    
    No change in behaviour.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 9174968b01565a13b046a14a46e9cb77ea4cb5c2
Author: Ralph Boehme <slow at samba.org>
Date:   Tue Nov 26 13:39:31 2019 +0100

    selftest: hardcode ad_dc_ntvfs for the rpc.netlogon testsuite
    
    The rpc.netlogon testsuite has a test that verifies LSA over netlogon which is
    only enabled in the ad_dc_ntvfs env.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 2d2809be7b17afd0a6054e93c9e5491a31356a1d
Author: Ralph Boehme <slow at samba.org>
Date:   Tue Nov 26 13:35:29 2019 +0100

    selftest: make testenv name logic more flexible for the rpc testcases
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit c20179a4f86bbaad75b0f87376257080760c650b
Author: Ralph Boehme <slow at samba.org>
Date:   Mon Nov 25 14:17:50 2019 +0100

    selftest: use ad_dc_ntvfs env instead of ad_dc_default for samba4.ldb.ldaps
    
    ad_dc_default is currently an alias for ad_dc_ntvfs, so this is currently no
    change in behaviour, but this is going to change.
    
    As the ad_dc_ntvfs env specifies "ldap server require strong auth =
    allow_sasl_over_tls" and this is needed for the test, we have to let the test
    use the ad_dc_ntvfs env explicitly.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 python/samba/tests/samba_tool/group.py |  2 +-
 selftest/knownfail                     |  8 ++++----
 selftest/target/Samba4.pm              | 27 ++++++++++-----------------
 source4/selftest/tests.py              | 24 +++++++++++++++---------
 4 files changed, 30 insertions(+), 31 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/tests/samba_tool/group.py b/python/samba/tests/samba_tool/group.py
index 215219c3918..9db626ef923 100644
--- a/python/samba/tests/samba_tool/group.py
+++ b/python/samba/tests/samba_tool/group.py
@@ -233,7 +233,7 @@ class GroupCmdTestCase(SambaToolCmdTest):
                                                           os.environ["DC_PASSWORD"]))
         self.assertCmdSuccess(result, out, err)
         self.assertEquals(err, "", "Shouldn't be any error messages")
-        self.assertIn("dn: CN=Domain Users,CN=Users,DC=samba,DC=example,DC=com", out)
+        self.assertIn("dn: CN=Domain Users,CN=Users,DC=addom,DC=samba,DC=example,DC=com", out)
 
     def _randomGroup(self, base={}):
         """create a group with random attribute values, you can specify base
diff --git a/selftest/knownfail b/selftest/knownfail
index 6ee7af8ea03..6a776b12ae9 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -99,8 +99,8 @@
 ^samba4.rpc.netlogon.*.GetPassword
 ^samba4.rpc.netlogon.*.DatabaseRedo
 ^samba4.rpc.netlogon.*.netlogon.lsa_over_netlogon\(ad_dc\) #Broken by split of \\pipe\lsass from \\pipe\netlogon in the IDL
-^samba4.rpc.netlogon.*.netlogon.SetupCredentialsDowngrade\(ad_dc_default\) # Broken by allowing NT4 crypto on this environment
-^samba4.rpc.netlogon.*.netlogon.SetupCredentialsDowngrade\(ad_dc_default:local\) # Broken by allowing NT4 crypto on this environment
+^samba4.rpc.netlogon.*.netlogon.SetupCredentialsDowngrade\(ad_dc_ntvfs\) # Broken by allowing NT4 crypto on this environment
+^samba4.rpc.netlogon.*.netlogon.SetupCredentialsDowngrade\(ad_dc_ntvfs:local\) # Broken by allowing NT4 crypto on this environment
 ^samba4.rpc.drsuapi.*ncacn_ip_tcp.*validate # should only work with seal
 ^samba4.rpc.drsuapi.*ncacn_ip_tcp.*bigendian # should only work with seal
 ^samba4.rpc.samr.passwords.validate.*ncacn_ip_tcp.*with.validate # should only work with seal
@@ -137,8 +137,8 @@
 ^samba4.smb2.acls.*.inheritflags
 ^samba4.smb2.acls.*.owner
 ^samba4.smb2.acls.*.ACCESSBASED
-^samba4.ldap.dirsync.python.ad_dc_default..__main__.ExtendedDirsyncTests.test_dirsync_deleted_items
-#^samba4.ldap.dirsync.python.ad_dc_default..__main__.ExtendedDirsyncTests.*
+^samba4.ldap.dirsync.python.ad_dc_ntvfs..__main__.ExtendedDirsyncTests.test_dirsync_deleted_items
+#^samba4.ldap.dirsync.python.ad_dc_ntvfs..__main__.ExtendedDirsyncTests.*
 ^samba4.libsmbclient.opendir.(NT1|SMB3).opendir # This requires netbios browsing
 ^samba4.rpc.drsuapi.*.drsuapi.DsGetDomainControllerInfo\(.*\)$
 ^samba4.smb2.oplock.exclusive2\(.*\)$ # samba 4 oplocks are a mess
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 23dafba1574..3e6692ce529 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1332,8 +1332,6 @@ sub provision_promoted_dc($$$)
 					       $dcvars->{SERVER_IP},
 					       $dcvars->{SERVER_IPV6});
 
-	push (@{$ctx->{provision_options}}, "--use-ntvfs");
-
 	$ctx->{smb_conf_extra_options} = "
 	max xmit = 32K
 	server max protocol = SMB2
@@ -1370,7 +1368,7 @@ sub provision_promoted_dc($$$)
 	my $cmd = $self->get_cmd_env_vars($ret);
 	$cmd .= "$samba_tool domain dcpromo $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}";
 	$cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
-	$cmd .= " --machinepass=machine$ret->{PASSWORD} --use-ntvfs --dns-backend=BIND9_DLZ";
+	$cmd .= " --machinepass=machine$ret->{PASSWORD} --dns-backend=BIND9_DLZ";
 
 	unless (system($cmd) == 0) {
 		warn("Join failed\n$cmd");
@@ -1407,8 +1405,6 @@ sub provision_vampire_dc($$$)
 					       $dcvars->{SERVER_IP},
 					       $dcvars->{SERVER_IPV6});
 
-	push (@{$ctx->{provision_options}}, "--use-ntvfs");
-
 	$ctx->{smb_conf_extra_options} = "
 	max xmit = 32K
 	server max protocol = SMB2
@@ -1435,7 +1431,7 @@ sub provision_vampire_dc($$$)
 	my $cmd = $self->get_cmd_env_vars($ret);
 	$cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}";
 	$cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD} --domain-critical-only";
-	$cmd .= " --machinepass=machine$ret->{PASSWORD} --use-ntvfs";
+	$cmd .= " --machinepass=machine$ret->{PASSWORD}";
 	$cmd .= " --backend-store=mdb";
 
 	unless (system($cmd) == 0) {
@@ -1507,7 +1503,7 @@ sub provision_fl2000dc($$)
 	spnego:simulate_w2k=yes
 	ntlmssp_server:force_old_spnego=yes
 ";
-	my $extra_provision_options = ["--use-ntvfs", "--base-schema=2008_R2"];
+	my $extra_provision_options = ["--base-schema=2008_R2"];
 	# This environment uses plain text secrets
 	# i.e. secret attributes are not encrypted on disk.
 	# This allows testing of the --plaintext-secrets option for
@@ -1549,7 +1545,7 @@ sub provision_fl2003dc($$$)
 	dcesrv:header signing = no
 	dcesrv:max auth states = 0
 	dns forwarder = $ip_addr1 $ip_addr2";
-	my $extra_provision_options = ["--use-ntvfs", "--base-schema=2008_R2"];
+	my $extra_provision_options = ["--base-schema=2008_R2"];
 	my $ret = $self->provision($prefix,
 				   "domain controller",
 				   "dc6",
@@ -1599,7 +1595,7 @@ sub provision_fl2008r2dc($$$)
 
 	print "PROVISIONING DC WITH FOREST LEVEL 2008r2...\n";
         my $extra_conf_options = "ldap server require strong auth = no";
-	my $extra_provision_options = ["--use-ntvfs", "--base-schema=2008_R2"];
+	my $extra_provision_options = ["--base-schema=2008_R2"];
 	my $ret = $self->provision($prefix,
 				   "domain controller",
 				   "dc7",
@@ -1645,8 +1641,6 @@ sub provision_rodc($$$)
 		return undef;
 	}
 
-	push (@{$ctx->{provision_options}}, "--use-ntvfs");
-
 	$ctx->{share} = "$ctx->{prefix_abs}/share";
 	push(@{$ctx->{directories}}, "$ctx->{share}");
 
@@ -1681,7 +1675,7 @@ sub provision_rodc($$$)
 	my $cmd = $self->get_cmd_env_vars($ret);
 	$cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} RODC";
 	$cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}";
-	$cmd .= " --server=$dcvars->{DC_SERVER} --use-ntvfs";
+	$cmd .= " --server=$dcvars->{DC_SERVER}";
 
 	unless (system($cmd) == 0) {
 		warn("RODC join failed\n$cmd");
@@ -1891,8 +1885,7 @@ sub provision_chgdcpass($$)
 	allow dcerpc auth level connect:lsarpc = yes
 	dcesrv:max auth states = 8
 ";
-	my $extra_provision_options = ["--use-ntvfs"];
-	push (@{$extra_provision_options}, "--dns-backend=BIND9_DLZ");
+	my $extra_provision_options = ["--dns-backend=BIND9_DLZ"];
 	my $ret = $self->provision($prefix,
 				   "domain controller",
 				   "chgdcpass",
@@ -2081,9 +2074,9 @@ sub check_env($$)
 	labdc                => ["backupfromdc"],
 
 	# aliases in order to split autbuild tasks
-	fl2008dc             => ["ad_dc_ntvfs"],
-	ad_dc_default        => ["ad_dc_ntvfs"],
-	ad_dc_slowtests      => ["ad_dc_ntvfs"],
+	fl2008dc             => ["ad_dc"],
+	ad_dc_default        => ["ad_dc"],
+	ad_dc_slowtests      => ["ad_dc"],
 	ad_dc_backup         => ["ad_dc"],
 
 	schema_dc      => ["dns_hub"],
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 43fbf0e5f0f..121ef2bd691 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -87,7 +87,7 @@ finally:
 have_heimdal_support = ("SAMBA4_USES_HEIMDAL" in config_hash)
 
 for options in ['-U"$USERNAME%$PASSWORD"']:
-    plantestsuite("samba4.ldb.ldaps with options %s(ad_dc_default)" % options, "ad_dc_default",
+    plantestsuite("samba4.ldb.ldaps with options %s(ad_dc_ntvfs)" % options, "ad_dc_ntvfs",
                   "%s/test_ldb.sh ldaps $SERVER_IP %s" % (bbdir, options))
 
 creds_options = [
@@ -192,9 +192,10 @@ auto_rpc_tests = list(filter(lambda t: t not in all_rpc_tests, rpc_tests))
 for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
     for transport in ["ncalrpc", "ncacn_np", "ncacn_ip_tcp"]:
         env = "ad_dc_default"
+        local = ""
         if transport == "ncalrpc":
             tests = ncalrpc_tests
-            env = "ad_dc_default:local"
+            local = ":local"
         elif transport == "ncacn_np":
             tests = ncacn_np_tests
         elif transport == "ncacn_ip_tcp":
@@ -202,8 +203,10 @@ for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
         else:
             raise AssertionError("invalid transport %r" % transport)
         for t in tests:
-            plansmbtorture4testsuite(t, env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s on %s with %s" % (t, transport, bindoptions))
-        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))
+            if t == "rpc.netlogon":
+                env = "ad_dc_ntvfs"
+            plansmbtorture4testsuite(t, env + local, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s on %s with %s" % (t, transport, bindoptions))
+        plansmbtorture4testsuite('rpc.samba3-sharesec', env + local, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$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
 #
@@ -215,7 +218,10 @@ for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
 
 for bindoptions in [""] + validate_list + ["bigendian"]:
     for t in auto_rpc_tests:
-        plansmbtorture4testsuite(t, "ad_dc_default", ["$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s with %s" % (t, bindoptions))
+        env = "ad_dc_default"
+        if t in ["rpc.srvsvc", "rpc.mgmt"]:
+            env = "ad_dc_ntvfs"
+        plansmbtorture4testsuite(t, env, ["$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s with %s" % (t, bindoptions))
 
 t = "rpc.countcalls"
 plansmbtorture4testsuite(t, "ad_dc_default:local", ["$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], modname="samba4.%s" % t)
@@ -652,7 +658,7 @@ planpythontestsuite("ad_dc_default:local", "samba.tests.dsdb")
 planpythontestsuite("none", "samba.tests.dsdb_lock")
 planpythontestsuite("ad_dc_default:local", "samba.tests.dcerpc.bare")
 planpythontestsuite("ad_dc_default:local", "samba.tests.dcerpc.unix")
-planpythontestsuite("ad_dc_default:local", "samba.tests.dcerpc.srvsvc")
+planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.srvsvc")
 planpythontestsuite("ad_dc_default:local", "samba.tests.samba_tool.timecmd")
 planpythontestsuite("ad_dc_default:local", "samba.tests.samba_tool.join")
 planpythontestsuite("ad_dc_default",
@@ -686,7 +692,7 @@ for env in ["ad_dc_ntvfs", "ad_dc", "offlinebackupdc", "renamedc",
     planpythontestsuite(env + ":local", "samba.tests.samba_tool.gpo")
 
 planpythontestsuite("ad_dc_default:local", "samba.tests.samba_tool.processes")
-planpythontestsuite("ad_dc_default:local", "samba.tests.samba_tool.user")
+planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.user")
 planpythontestsuite("ad_dc_default:local", "samba.tests.samba_tool.user_wdigest")
 planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.user")
 planpythontestsuite("ad_dc:local", "samba.tests.samba_tool.user_virtualCryptSHA")
@@ -901,7 +907,7 @@ for env in ['ad_dc_default:local', 'schema_dc:local']:
     planpythontestsuite(env, "samba.tests.dsdb_schema_attributes")
 
 plantestsuite_loadlist("samba4.urgent_replication.python(ad_dc_ntvfs)", "ad_dc_ntvfs:local", [python, os.path.join(DSDB_PYTEST_DIR, "urgent_replication.py"), '$PREFIX_ABS/ad_dc_ntvfs/private/sam.ldb', '$LOADLIST', '$LISTOPT'])
-plantestsuite_loadlist("samba4.ldap.dirsync.python(ad_dc_default)", "ad_dc_default", [python, os.path.join(DSDB_PYTEST_DIR, "dirsync.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
+plantestsuite_loadlist("samba4.ldap.dirsync.python(ad_dc_ntvfs)", "ad_dc_ntvfs", [python, os.path.join(DSDB_PYTEST_DIR, "dirsync.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
 plantestsuite_loadlist("samba4.ldap.match_rules.python", "ad_dc_ntvfs", [python, os.path.join(srcdir(), "lib/ldb-samba/tests/match_rules.py"), '$PREFIX_ABS/ad_dc_ntvfs/private/sam.ldb', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
 plantestsuite("samba4.ldap.index.python", "none", [python, os.path.join(srcdir(), "lib/ldb-samba/tests/index.py")])
 plantestsuite_loadlist("samba4.ldap.notification.python(ad_dc_ntvfs)", "ad_dc_ntvfs", [python, os.path.join(DSDB_PYTEST_DIR, "notification.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN', '$LOADLIST', '$LISTOPT'])
@@ -938,7 +944,7 @@ plantestsuite_loadlist("samba4.ldap.subtree_rename.python(ad_dc_ntvfs)",
                         '$LISTOPT'])
 
 planoldpythontestsuite(
-    "ad_dc_default",
+    "ad_dc_ntvfs",
     "samba.tests.ldap_referrals",
     environ={
         'SERVER': '$SERVER',


-- 
Samba Shared Repository



More information about the samba-cvs mailing list