diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-19 13:50:40 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-19 09:03:07 +0200 |
| commit | dfb490d551e9213e957ea547cb399c3ed408bdc9 (patch) | |
| tree | 904af14cb3d1cacf7432d79ab664424099ff69a7 /selftest/target/Samba4.pm | |
| parent | 5189cfca4ea230125c7995d30caf2b48a332deb0 (diff) | |
| download | samba-dfb490d551e9213e957ea547cb399c3ed408bdc9.tar.gz samba-dfb490d551e9213e957ea547cb399c3ed408bdc9.tar.bz2 samba-dfb490d551e9213e957ea547cb399c3ed408bdc9.zip | |
selftest Consolidate server wall clock time limits
This helps ensure that we don't have the Samba3 servers stop before
the full make test is finished.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Apr 19 09:03:07 CEST 2011 on sn-devel-104
Diffstat (limited to 'selftest/target/Samba4.pm')
| -rw-r--r-- | selftest/target/Samba4.pm | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 602a134982..69d5c3bc68 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -12,7 +12,7 @@ use POSIX; use SocketWrapper; sub new($$$$$) { - my ($classname, $bindir, $binary_mapping, $bindir_path, $ldap, $srcdir, $exeext) = @_; + my ($classname, $bindir, $binary_mapping, $bindir_path, $ldap, $srcdir, $exeext, $server_maxtime) = @_; $exeext = "" unless defined($exeext); my $self = { @@ -22,7 +22,8 @@ sub new($$$$$) { binary_mapping => $binary_mapping, bindir_path => $bindir_path, srcdir => $srcdir, - exeext => $exeext + exeext => $exeext, + server_maxtime => $server_maxtime }; bless $self; return $self; @@ -82,9 +83,9 @@ sub slapd_stop($$) return 1; } -sub check_or_start($$$) +sub check_or_start($$) { - my ($self, $env_vars, $max_time) = @_; + my ($self, $env_vars) = @_; return 0 if ( -p $env_vars->{SAMBA_TEST_FIFO}); unlink($env_vars->{SAMBA_TEST_FIFO}); @@ -126,9 +127,7 @@ sub check_or_start($$$) } my $optarg = ""; - if (defined($max_time)) { - $optarg = "--maximum-runtime=$max_time "; - } + $optarg = "--maximum-runtime=$self->{server_maxtime}"; if (defined($ENV{SAMBA_OPTIONS})) { $optarg.= " $ENV{SAMBA_OPTIONS}"; } @@ -1363,7 +1362,7 @@ sub setup_member($$$) my $env = $self->provision_member($path, $dc_vars); if (defined $env) { - $self->check_or_start($env, ($ENV{SMBD_MAXTIME} or 7500)); + $self->check_or_start($env); $self->wait_for_start($env); @@ -1380,7 +1379,7 @@ sub setup_rpc_proxy($$$) my $env = $self->provision_rpc_proxy($path, $dc_vars); if (defined $env) { - $self->check_or_start($env, ($ENV{SMBD_MAXTIME} or 7500)); + $self->check_or_start($env); $self->wait_for_start($env); @@ -1395,8 +1394,7 @@ sub setup_dc($$) my $env = $self->provision_dc($path); if (defined $env) { - $self->check_or_start($env, - ($ENV{SMBD_MAXTIME} or 7500)); + $self->check_or_start($env); $self->wait_for_start($env); @@ -1411,8 +1409,7 @@ sub setup_fl2000dc($$) my $env = $self->provision_fl2000dc($path); if (defined $env) { - $self->check_or_start($env, - ($ENV{SMBD_MAXTIME} or 7500)); + $self->check_or_start($env); $self->wait_for_start($env); @@ -1429,8 +1426,7 @@ sub setup_fl2003dc($$) my $env = $self->provision_fl2003dc($path); if (defined $env) { - $self->check_or_start($env, - ($ENV{SMBD_MAXTIME} or 7500)); + $self->check_or_start($env); $self->wait_for_start($env); @@ -1446,8 +1442,7 @@ sub setup_fl2008r2dc($$) my $env = $self->provision_fl2008r2dc($path); if (defined $env) { - $self->check_or_start($env, - ($ENV{SMBD_MAXTIME} or 7500)); + $self->check_or_start($env); $self->wait_for_start($env); @@ -1464,8 +1459,7 @@ sub setup_vampire_dc($$$) my $env = $self->provision_vampire_dc($path, $dc_vars); if (defined $env) { - $self->check_or_start($env, - ($ENV{SMBD_MAXTIME} or 7500)); + $self->check_or_start($env); $self->wait_for_start($env); @@ -1518,8 +1512,7 @@ sub setup_rodc($$$) return undef; } - $self->check_or_start($env, - ($ENV{SMBD_MAXTIME} or 7500)); + $self->check_or_start($env); $self->wait_for_start($env); |