sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

selftest: consitently use the name s4member

Browse Source 
This avoids a conflict with the Samba3.pm defined member environment, and so spurious
failures in make test for the member environment dependent on test ordering.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Andrew Bartlett 2014-05-24 22:47:30 +12:00
parent f9a9e18f15
commit 34e8deccf9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
selftest/target/Samba4.pm
View File

@ -916,7 +916,7 @@ $extra_smbconf_shares
return $self->provision_raw_step2($ctx, $ret);
}
sub provision_member($$$)
sub provision_s4member($$$)
{
my ($self, $prefix, $dcvars) = @_;
print "PROVISIONING MEMBER...";
@ -1703,7 +1703,7 @@ sub setup_env($$$)
if (not defined($self->{vars}->{dc})) {
$self->setup_dc("$path/dc");
}
return $self->setup_member("$path/s4member", $self->{vars}->{dc});
return $self->setup_s4member("$path/s4member", $self->{vars}->{dc});
} elsif ($envname eq "rodc") {
if (not defined($self->{vars}->{dc})) {
$self->setup_dc("$path/dc");
@ -1729,18 +1729,18 @@ sub setup_env($$$)
}
}
sub setup_member($$$)
sub setup_s4member($$$)
{
my ($self, $path, $dc_vars) = @_;
my $env = $self->provision_member($path, $dc_vars);
my $env = $self->provision_s4member($path, $dc_vars);
if (defined $env) {
$self->check_or_start($env, "single");
$self->wait_for_start($env);
$self->{vars}->{member} = $env;
$self->{vars}->{s4member} = $env;
}
return $env;