diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2017-03-18 22:35:31 -0400 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2017-03-19 23:48:50 -0400 |
| commit | aa14493e4788f602d86defb3fa6509d41f01664b (patch) | |
| tree | bb3d24fb1c3c681a2a60c8ed7a5453a63a3e8eec | |
| parent | 1804ccbd6da9a16600f226526e7bd61f5b01596f (diff) | |
| download | lighttpd-git-aa14493e4788f602d86defb3fa6509d41f01664b.tar.gz | |
[tests] reduce time waiting for backends to start
reduce time spent waiting for backends to start
tests check for active listening port before proceeding
test runs now complete in about 2/3 the time
| -rw-r--r-- | src/mod_fastcgi.c | 2 | ||||
| -rw-r--r-- | src/mod_scgi.c | 2 | ||||
| -rw-r--r-- | tests/LightyTest.pm | 4 | ||||
| -rwxr-xr-x | tests/mod-fastcgi.t | 6 | ||||
| -rwxr-xr-x | tests/mod-scgi.t | 6 |
5 files changed, 12 insertions, 8 deletions
diff --git a/src/mod_fastcgi.c b/src/mod_fastcgi.c index cd122899..9334aa26 100644 --- a/src/mod_fastcgi.c +++ b/src/mod_fastcgi.c @@ -939,7 +939,7 @@ static int fcgi_spawn_connection(server *srv, fcgi_proc *proc) { int fcgi_fd; int status; - struct timeval tv = { 0, 100 * 1000 }; + struct timeval tv = { 0, 10 * 1000 }; #ifdef HAVE_SYS_UN_H struct sockaddr_un fcgi_addr_un; #endif diff --git a/src/mod_scgi.c b/src/mod_scgi.c index 80d2bf4b..4c50fd4c 100644 --- a/src/mod_scgi.c +++ b/src/mod_scgi.c @@ -709,7 +709,7 @@ static int scgi_spawn_connection(server *srv, scgi_proc *proc) { int scgi_fd; int status; - struct timeval tv = { 0, 100 * 1000 }; + struct timeval tv = { 0, 10 * 1000 }; #ifdef HAVE_SYS_UN_H struct sockaddr_un scgi_addr_un; #endif diff --git a/tests/LightyTest.pm b/tests/LightyTest.pm index f1865896..74caea1e 100644 --- a/tests/LightyTest.pm +++ b/tests/LightyTest.pm @@ -122,10 +122,10 @@ sub wait_for_port_with_proc { my $self = shift; my $port = shift; my $child = shift; - my $timeout = 10*10; # 10 secs (valgrind might take a while), select waits 0.1 s + my $timeout = 10*50; # 10 secs (valgrind might take a while), select waits 0.02 s while (0 == $self->listening_on($port)) { - select(undef, undef, undef, 0.1); + select(undef, undef, undef, 0.02); $timeout--; # the process is gone, we failed diff --git a/tests/mod-fastcgi.t b/tests/mod-fastcgi.t index 582e04fb..884acf70 100755 --- a/tests/mod-fastcgi.t +++ b/tests/mod-fastcgi.t @@ -410,8 +410,10 @@ EOF ok($tf->handle_http($t) == 0, 'killing fastcgi and wait for restart'); # (might take lighttpd 1 sec to detect backend exit) - select(undef, undef, undef, .9); - select(undef, undef, undef, .1) while (!$tf->listening_on(10000)); + select(undef, undef, undef, .5); + for (my $c = 2*20; $c && 0 == $tf->listening_on(10000); --$c) { + select(undef, undef, undef, 0.05); + } $t->{REQUEST} = ( <<EOF GET /index.fcgi?crlf HTTP/1.0 Host: www.example.org diff --git a/tests/mod-scgi.t b/tests/mod-scgi.t index 20b11482..12c11a80 100755 --- a/tests/mod-scgi.t +++ b/tests/mod-scgi.t @@ -76,8 +76,10 @@ EOF ok($tf->handle_http($t) == 0, 'killing scgi and wait for restart'); # (might take lighttpd 1 sec to detect backend exit) - select(undef, undef, undef, .9); - select(undef, undef, undef, .1) while (!$tf->listening_on(10000)); + select(undef, undef, undef, .5); + for (my $c = 2*20; $c && 0 == $tf->listening_on(10000); --$c) { + select(undef, undef, undef, 0.05); + } $t->{REQUEST} = ( <<EOF GET /index.scgi?crlf HTTP/1.0 Host: www.example.org |