From e1f9fb79c79e6a1ef72b07c8df6256caa291e957 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 15 Feb 2012 16:08:05 +1100 Subject: selftest: Make plugin_s4_dc set the cached environment correctly --- selftest/target/Samba4.pm | 22 ++++++++++++---------- 1 file 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; } -- cgit