diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-18 18:57:22 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-19 14:26:59 +1000 |
| commit | 790ceec78bc4f1b5234d8f90eb4bfaa11c2f7d4b (patch) | |
| tree | 298237dba13e07c1676e5237fd1dfb31723dfbe3 /selftest | |
| parent | 55cb12531201f66660c999172ef1b17e05051062 (diff) | |
| download | samba-790ceec78bc4f1b5234d8f90eb4bfaa11c2f7d4b.tar.gz samba-790ceec78bc4f1b5234d8f90eb4bfaa11c2f7d4b.tar.bz2 samba-790ceec78bc4f1b5234d8f90eb4bfaa11c2f7d4b.zip | |
s4-selftest Rename Samba4 'member' test environment to s4member
This will avoid a conflict with the s3 'member' environment.
Andrew Bartlett
Diffstat (limited to 'selftest')
| -rw-r--r-- | selftest/target/Samba4.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 9b8e3b98d0..dd7daf736d 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -878,7 +878,7 @@ sub provision_member($$$) my $ret = $self->provision($prefix, "member server", - "localmember", + "s4member", "SAMBADOMAIN", "samba.example.com", "2008", @@ -1294,11 +1294,11 @@ sub setup_env($$$) $self->setup_dc("$path/dc"); } return $self->setup_vampire_dc("$path/vampire_dc", $self->{vars}->{dc}); - } elsif ($envname eq "member") { + } elsif ($envname eq "s4member") { if (not defined($self->{vars}->{dc})) { $self->setup_dc("$path/dc"); } - return $self->setup_member("$path/member", $self->{vars}->{dc}); + return $self->setup_member("$path/s4member", $self->{vars}->{dc}); } elsif ($envname eq "rodc") { if (not defined($self->{vars}->{dc})) { $self->setup_dc("$path/dc"); @@ -1309,7 +1309,7 @@ sub setup_env($$$) $ENV{ENVNAME} = "dc"; $self->setup_dc("$path/dc"); } - my $ret = $self->setup_member("$path/member", $self->{vars}->{dc}); + my $ret = $self->setup_member("$path/s4member", $self->{vars}->{dc}); if (not defined($self->{vars}->{rpc_proxy})) { $ENV{ENVNAME} = "rpc_proxy"; my $rpc_proxy_ret = $self->setup_rpc_proxy("$path/rpc_proxy", $self->{vars}->{dc}); |