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

selftest: Convert Samba3::check_or_start() to named parameters

Browse Source 
Another parameter will be added soon.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Volker Lendecke 2020-01-30 16:01:09 +01:00 committed by Martin Schwenke
parent ff5dd4bb4f
commit 154d7c8eaf
1 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
selftest/target/Samba3.pm
View File

@ -230,7 +230,11 @@ sub setup_nt4_dc
$vars or return undef;
if (not $self->check_or_start($vars, "yes", "yes", "yes")) {
if (not $self->check_or_start(
env_vars => $vars,
nmbd => "yes",
winbindd => "yes",
smbd => "yes")) {
return undef;
}
@ -281,7 +285,11 @@ sub setup_nt4_dc_schannel
$vars or return undef;
if (not $self->check_or_start($vars, "yes", "yes", "yes")) {
if (not $self->check_or_start(
env_vars => $vars,
nmbd => "yes",
winbindd => "yes",
smbd => "yes")) {
return undef;
}
@ -362,7 +370,11 @@ sub setup_nt4_member
return undef;
}
if (not $self->check_or_start($ret, "yes", "yes", "yes")) {
if (not $self->check_or_start(
env_vars => $ret,
nmbd => "yes",
winbindd => "yes",
smbd => "yes")) {
return undef;
}
@ -495,7 +507,11 @@ sub setup_ad_member
# access the share for tests.
chmod 0777, "$prefix/share";
if (not $self->check_or_start($ret, "yes", "yes", "yes")) {
if (not $self->check_or_start(
env_vars => $ret,
nmbd => "yes",
winbindd => "yes",
smbd => "yes")) {
return undef;
}
@ -614,7 +630,11 @@ sub setup_ad_member_rfc2307
# access the share for tests.
chmod 0777, "$prefix/share";
if (not $self->check_or_start($ret, "yes", "yes", "yes")) {
if (not $self->check_or_start(
env_vars => $ret,
nmbd => "yes",
winbindd => "yes",
smbd => "yes")) {
return undef;
}
@ -708,7 +728,11 @@ sub setup_ad_member_idmap_rid
# access the share for tests.
chmod 0777, "$prefix/share";
if (not $self->check_or_start($ret, "yes", "yes", "yes")) {
if (not $self->check_or_start(
env_vars => $ret,
nmbd => "yes",
winbindd => "yes",
smbd => "yes")) {
return undef;
}
@ -801,7 +825,11 @@ sub setup_ad_member_idmap_ad
# access the share for tests.
chmod 0777, "$prefix/share";
if (not $self->check_or_start($ret, "yes", "yes", "yes")) {
if (not $self->check_or_start(
env_vars => $ret,
nmbd => "yes",
winbindd => "yes",
smbd => "yes")) {
return undef;
}
@ -918,7 +946,10 @@ sub setup_simpleserver
$vars or return undef;
if (not $self->check_or_start($vars, "yes", "no", "yes")) {
if (not $self->check_or_start(
env_vars => $vars,
nmbd => "yes",
smbd => "yes")) {
return undef;
}
@ -1104,7 +1135,10 @@ sub setup_fileserver
$vars or return undef;
if (not $self->check_or_start($vars, "yes", "no", "yes")) {
if (not $self->check_or_start(
env_vars => $vars,
nmbd => "yes",
smbd => "yes")) {
return undef;
}
@ -1255,7 +1289,10 @@ $ret->{USERNAME} = KTEST\\Administrator
# access the share for tests.
chmod 0777, "$prefix/share";
if (not $self->check_or_start($ret, "yes", "no", "yes")) {
if (not $self->check_or_start(
env_vars => $ret,
nmbd => "yes",
smbd => "yes")) {
return undef;
}
return $ret;
@ -1281,7 +1318,10 @@ ntlm auth = yes
$vars or return undef;
if (not $self->check_or_start($vars, "yes", "no", "yes")) {
if (not $self->check_or_start(
env_vars => $vars,
nmbd => "yes",
smbd => "yes")) {
return undef;
}
@ -1341,8 +1381,13 @@ sub make_bin_cmd
return (@preargs, $binary, @args, @optargs);
}
sub check_or_start($$$$$) {
my ($self, $env_vars, $nmbd, $winbindd, $smbd) = @_;
sub check_or_start($$) {
my ($self, %args) = @_;
my $env_vars = $args{env_vars};
my $nmbd = $args{nmbd} // "no";
my $winbindd = $args{winbindd} // "no";
my $smbd = $args{smbd} // "no";
my $STDIN_READER;
# use a pipe for stdin in the child processes. This allows