test: Get the clusteredmember environment out of its smb1 corner

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Fri Oct 16 18:30:18 UTC 2020 on sn-devel-184

diff --git a/script/autobuild.py b/script/autobuild.py
index 47bc8289491d599dc53d061be31cee99c7d822aa..0bf80d5e8218721aa3355e134295bcd07b58bbf0 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -257,7 +257,7 @@ tasks = {
             "ad_dc_slowtests",
             "schema_pair_dc",
             "schema_dc",
-            "clusteredmember_smb1",
+            "clusteredmember",
             ])),
         ("test-slow-none", make_test(cmd='make test', TESTS="--include=selftest/slow-none", include_envs=["none"])),
         ("lcov", LCOV_CMD),
@@ -320,7 +320,7 @@ tasks = {
             "ad_dc_slowtests",
             "schema_pair_dc",
             "schema_dc",
-            "clusteredmember_smb1",
+            "clusteredmember",
             ])),
         ("lcov", LCOV_CMD),
         ("install", "make install"),
@@ -609,7 +609,7 @@ tasks = {
 
         ("test",
          make_test(cmd='make test',
-                   include_envs=["clusteredmember_smb1"])
+                   include_envs=["clusteredmember"])
         ),
 
         # clean up:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 2d7d269b9f1dbc0249420f0a7a0bdc9591fd7a0c..646ff9b48951c9006a1276f71c1f881ac4fcbce4 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -239,7 +239,7 @@ sub check_env($$)
        ad_member_idmap_ad  => ["fl2008r2dc"],
        ad_member_fips      => ["ad_dc_fips"],
 
-       clusteredmember_smb1 => ["nt4_dc"],
+       clusteredmember => ["nt4_dc"],
 );
 
 %Samba3::ENV_DEPS_POST = ();
@@ -465,7 +465,7 @@ sub setup_nt4_member
        return $ret;
 }
 
-sub setup_clusteredmember_smb1
+sub setup_clusteredmember
 {
        my ($self, $prefix, $nt4_dc_vars) = @_;
        my $count = 0;

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index a76f3d5c2c96fe6cf3fc264e20194f90f5c44042..f0b01a8a740c51660a8b6bcf16b1d0ec69197724 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -1134,7 +1134,7 @@ plantestsuite("samba3.blackbox.smbclient-mget",
 t = "readdir-timestamp"
 plantestsuite(
     "samba3.smbtorture_s3.plain.%s" % t,
-    "clusteredmember_smb1",
+    "clusteredmember",
     [os.path.join(samba3srcdir,
                   "script/tests/test_smbtorture_s3.sh"),
      t,
@@ -1143,7 +1143,7 @@ plantestsuite(
      '$DC_PASSWORD',
      smbtorture3,
      "",
-     "-b $PREFIX/clusteredmember_smb1/unclists/tmp.txt -N 5 -o 10"])
+     "-b $PREFIX/clusteredmember/unclists/tmp.txt -N 5 -o 10"])
 
 def planclusteredmembertestsuite(tname, prefix):
     '''Define a clustered test for the clusteredmember environment'''
@@ -1155,7 +1155,7 @@ def planclusteredmembertestsuite(tname, prefix):
     modnamearg = 'samba3.%s' % namearg
     extraargs = ''
 
-    prefix = os.path.join(prefix, 'clusteredmember_smb1')
+    prefix = os.path.join(prefix, 'clusteredmember')
     unclist = os.path.join(prefix, 'unclists/%s.txt' % tshare)
 
     unclistarg = '--unclist=%s' % unclist
@@ -1163,7 +1163,7 @@ def planclusteredmembertestsuite(tname, prefix):
 
     return selftesthelpers.plansmbtorture4testsuite(
         namearg,
-        'clusteredmember_smb1',
+        'clusteredmember',
         [extraargs, unclistarg, sharearg, autharg, tname],
         target='samba3',
         modname=modnamearg)
@@ -1182,7 +1182,7 @@ CLUSTERED_LOCAL_TESTS = [
 for t in CLUSTERED_LOCAL_TESTS:
     plantestsuite(
         "samba3.%s" % t,
-        "clusteredmember_smb1:local",
+        "clusteredmember:local",
         [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"),
          t,
          '//foo/bar',