sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

selftest: allow SMB1 in clusteredmember env

Browse Source 
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>
This commit is contained in:
Ralph Boehme 2020-02-21 17:44:55 +01:00
parent 84c130a655
commit a45e637025
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
script/autobuild.py
View File

@ -234,7 +234,7 @@ tasks = {
"ad_dc_slowtests", "ad_dc_slowtests",
"schema_pair_dc", "schema_pair_dc",
"schema_dc", "schema_dc",
"clusteredmember", "clusteredmember_smb1",
])), ])),
("lcov", LCOV_CMD), ("lcov", LCOV_CMD),
("install", "make install"), ("install", "make install"),
@ -286,7 +286,7 @@ tasks = {
"ad_dc_slowtests", "ad_dc_slowtests",
"schema_pair_dc", "schema_pair_dc",
"schema_dc", "schema_dc",
"clusteredmember", "clusteredmember_smb1",
])), ])),
("lcov", LCOV_CMD), ("lcov", LCOV_CMD),
("install", "make install"), ("install", "make install"),
@ -557,7 +557,7 @@ tasks = {
("test", ("test",
make_test(cmd='make test', make_test(cmd='make test',
include_envs=["clusteredmember"]) include_envs=["clusteredmember_smb1"])
), ),
# clean up: # clean up:

6
selftest/target/Samba3.pm
View File

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

4
source3/selftest/tests.py
View File

@ -948,7 +948,7 @@ def planclusteredmembertestsuite(tname, prefix):
modnamearg = 'samba3.%s' % namearg modnamearg = 'samba3.%s' % namearg
extraargs = '' extraargs = ''
prefix = os.path.join(prefix, 'clusteredmember') prefix = os.path.join(prefix, 'clusteredmember_smb1')
unclist = os.path.join(prefix, 'unclists/%s.txt' % tshare) unclist = os.path.join(prefix, 'unclists/%s.txt' % tshare)
unclistarg = '--unclist=%s' % unclist unclistarg = '--unclist=%s' % unclist
@ -956,7 +956,7 @@ def planclusteredmembertestsuite(tname, prefix):
return selftesthelpers.plansmbtorture4testsuite( return selftesthelpers.plansmbtorture4testsuite(
namearg, namearg,
'clusteredmember', 'clusteredmember_smb1',
[extraargs, unclistarg, sharearg, autharg, tname], [extraargs, unclistarg, sharearg, autharg, tname],
target='samba3', target='samba3',
modname=modnamearg) modname=modnamearg)