selftest: allow SMB1 in clusteredmember env

This is a relatively new test environment that only uses very few tests
yet. Skip the env name rename dance for this env, but someone has to convert the
tests later on.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Noel Power <npower@samba.org>

diff --git a/script/autobuild.py b/script/autobuild.py
index 8cee3ecbbbf29e07aa07f6c809fbd35fed2a7ed8..5dca18d3d8e0544313df1fae5fa095cff169e8d9 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -234,7 +234,7 @@ tasks = {
             "ad_dc_slowtests",
             "schema_pair_dc",
             "schema_dc",
-            "clusteredmember",
+            "clusteredmember_smb1",
             ])),
         ("lcov", LCOV_CMD),
         ("install", "make install"),
@@ -286,7 +286,7 @@ tasks = {
             "ad_dc_slowtests",
             "schema_pair_dc",
             "schema_dc",
-            "clusteredmember",
+            "clusteredmember_smb1",
             ])),
         ("lcov", LCOV_CMD),
         ("install", "make install"),
@@ -557,7 +557,7 @@ tasks = {
 
         ("test",
          make_test(cmd='make test',
-                   include_envs=["clusteredmember"])
+                   include_envs=["clusteredmember_smb1"])
         ),
 
         # clean up:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index fe871af4573a70eb5d76a61d71a57708144bc370..1b8d9536fdac3c3e817c43baf2cd1a2fa923e9f4 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -226,7 +226,7 @@ sub check_env($$)
        ad_member_idmap_rid => ["ad_dc"],
        ad_member_idmap_ad  => ["fl2008r2dc"],
 
-       clusteredmember     => ["nt4_dc"],
+       clusteredmember_smb1 => ["nt4_dc"],
 );
 
 %Samba3::ENV_DEPS_POST = ();
@@ -429,7 +429,7 @@ sub setup_nt4_member
        return $ret;
 }
 
-sub setup_clusteredmember
+sub setup_clusteredmember_smb1
 {
        my ($self, $prefix, $nt4_dc_vars) = @_;
        my $count = 0;
@@ -479,6 +479,8 @@ sub setup_clusteredmember
        server signing = on
        clustering = yes
        ctdbd socket = ${socket}
+       client min protocol = CORE
+       server min protocol = LANMAN1
        dbwrap_tdb_mutexes:* = yes
        ${require_mutexes}
 ";

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index a3f60aa4b0c2000340ba38346aa7c67badaf783a..00ba22be1ac87406c55c68a7d003528dbf3762d2 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -948,7 +948,7 @@ def planclusteredmembertestsuite(tname, prefix):
     modnamearg = 'samba3.%s' % namearg
     extraargs = ''
 
-    prefix = os.path.join(prefix, 'clusteredmember')
+    prefix = os.path.join(prefix, 'clusteredmember_smb1')
     unclist = os.path.join(prefix, 'unclists/%s.txt' % tshare)
 
     unclistarg = '--unclist=%s' % unclist
@@ -956,7 +956,7 @@ def planclusteredmembertestsuite(tname, prefix):
 
     return selftesthelpers.plansmbtorture4testsuite(
         namearg,
-        'clusteredmember',
+        'clusteredmember_smb1',
         [extraargs, unclistarg, sharearg, autharg, tname],
         target='samba3',
         modname=modnamearg)