diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-05-24 22:47:30 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-06-04 03:22:25 +0200 |
| commit | 34e8deccf989a43a811cb8e0a00fc82e67867b71 (patch) | |
| tree | 46f34c2a96a5d8efd52f22cb6fd3d957ce7c4604 /selftest | |
| parent | f9a9e18f15717e089e59cec86384a6fb9ecf1989 (diff) | |
| download | samba-34e8deccf989a43a811cb8e0a00fc82e67867b71.tar.gz samba-34e8deccf989a43a811cb8e0a00fc82e67867b71.tar.xz samba-34e8deccf989a43a811cb8e0a00fc82e67867b71.zip | |
selftest: consitently use the name s4member
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>
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/target/Samba4.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index c4e8f31bce7..50a4cd559c2 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -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; |