summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-02-15 16:08:05 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-02-16 15:21:10 +1100
commite1f9fb79c79e6a1ef72b07c8df6256caa291e957 (patch)
tree5f5b74c4b90eb9cb797ae0f31ff0ee7dccf3712a
parenta8a83611f01cf9d27b4dae7efa94f97aa7868e58 (diff)
downloadsamba-e1f9fb79c79e6a1ef72b07c8df6256caa291e957.tar.gz
samba-e1f9fb79c79e6a1ef72b07c8df6256caa291e957.tar.bz2
samba-e1f9fb79c79e6a1ef72b07c8df6256caa291e957.zip
selftest: Make plugin_s4_dc set the cached environment correctly
-rw-r--r--selftest/target/Samba4.pm22
1 files changed, 12 insertions, 10 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 8ac3ee7eaf..1838a893c5 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1659,18 +1659,20 @@ sub setup_plugin_s4_dc($$)
my ($self, $path) = @_;
my $env = $self->provision_plugin_s4_dc($path);
- if (defined $env) {
- $self->check_or_start($env, "single");
-
- $self->wait_for_start($env);
-
- my $s3_part_env = $self->{target3}->setup_plugin_s4_dc($path, $env, 30);
- if (not defined($s3_part_env)) {
- return undef;
- }
+ unless ($env) {
+ return undef;
+ }
- $self->{vars}->{plugin_s4_dc} = $s3_part_env;
+ $self->check_or_start($env, "single");
+
+ $self->wait_for_start($env);
+
+ my $s3_part_env = $self->{target3}->setup_plugin_s4_dc($path, $env, 30);
+ unless ($s3_part_env) {
+ return undef;
}
+
+ $self->{vars}->{plugin_s4_dc} = $env;
return $env;
}