[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 249/264: runtests: when <killserver> mentions http, kill http/2
From: |
gnunet |
Subject: |
[gnurl] 249/264: runtests: when <killserver> mentions http, kill http/2 too |
Date: |
Thu, 30 Apr 2020 16:09:12 +0200 |
This is an automated email from the git hooks/post-receive script.
nikita pushed a commit to branch master
in repository gnurl.
commit 11091cd4d2e86a47164604bf0b58781da9c1297b
Author: Daniel Stenberg <address@hidden>
AuthorDate: Fri Apr 24 13:29:48 2020 +0200
runtests: when <killserver> mentions http, kill http/2 too
Since the http2 test server is a mere proxy that needs to know about the
dynamic port the HTTP server is using, it too needs to get restarted
when the http server is killed.
A regression caused by 80d6515.
Fixes #5289
Closes #5291
---
tests/runtests.pl | 66 ++++++++-----------------------------------------------
1 file changed, 9 insertions(+), 57 deletions(-)
diff --git a/tests/runtests.pl b/tests/runtests.pl
index d43b2772b..051b23060 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -763,6 +763,7 @@ sub torture {
#
sub stopserver {
my ($server, $pidlist) = @_;
+
#
# kill sockfilter processes for pingpong relative server
#
@@ -792,6 +793,12 @@ sub stopserver {
# given a ssh server, also kill socks piggybacking one
push @killservers, "socks${2}";
}
+ if($server eq "http") {
+ # since the http2 server is a proxy that needs to know about the
+ # dynamic http port it too needs to get restarted when the http server
+ # is killed
+ push @killservers, "http/2";
+ }
push @killservers, $server;
#
# kill given pids and server relative ones clearing them in %run hash
@@ -2702,7 +2709,7 @@ sub cleardir {
return 0; # can't open dir
while($file = readdir(DIR)) {
if(($file !~ /^\./)) {
- unlink("$dir/$file");
+ #unlink("$dir/$file");
$count++;
}
}
@@ -3969,64 +3976,9 @@ sub singletest {
my @killtestservers = getpart("client", "killserver");
if(@killtestservers) {
- #
- # All servers relative to the given one must be stopped also
- #
- my @killservers;
foreach my $server (@killtestservers) {
chomp $server;
- if($server =~ /^(ftp|http|imap|pop3|smtp)s((\d*)(-ipv6|-unix|))$/)
{
- # given a stunnel ssl server, also kill non-ssl underlying one
- push @killservers, "${1}${2}";
- }
- elsif($server =~
/^(ftp|http|imap|pop3|smtp)((\d*)(-ipv6|-unix|))$/) {
- # given a non-ssl server, also kill stunnel piggybacking one
- push @killservers, "${1}s${2}";
- }
- elsif($server =~ /^(socks)((\d*)(-ipv6|))$/) {
- # given a socks server, also kill ssh underlying one
- push @killservers, "ssh${2}";
- }
- elsif($server =~ /^(ssh)((\d*)(-ipv6|))$/) {
- # given a ssh server, also kill socks piggybacking one
- push @killservers, "socks${2}";
- }
- push @killservers, $server;
- }
- #
- # kill sockfilter processes for pingpong relative servers
- #
- foreach my $server (@killservers) {
- if($server =~ /^(ftp|imap|pop3|smtp)s?(\d*)(-ipv6|)$/) {
- my $proto = $1;
- my $idnum = ($2 && ($2 > 1)) ? $2 : 1;
- my $ipvnum = ($3 && ($3 =~ /6$/)) ? 6 : 4;
- killsockfilters($proto, $ipvnum, $idnum, $verbose);
- }
- }
- #
- # kill server relative pids clearing them in %run hash
- #
- my $pidlist;
- foreach my $server (@killservers) {
- if($run{$server}) {
- $pidlist .= "$run{$server} ";
- $run{$server} = 0;
- }
- $runcert{$server} = 0 if($runcert{$server});
- }
- killpid($verbose, $pidlist);
- #
- # cleanup server pid files
- #
- foreach my $server (@killservers) {
- my $pidfile = $serverpidfile{$server};
- my $pid = processexists($pidfile);
- if($pid > 0) {
- logmsg "Warning: $server server unexpectedly alive\n";
- killpid($verbose, $pid);
- }
- unlink($pidfile) if(-f $pidfile);
+ stopserver($server);
}
}
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 201/264: appveyor: add Unicode winbuild jobs, (continued)
- [gnurl] 201/264: appveyor: add Unicode winbuild jobs, gnunet, 2020/04/30
- [gnurl] 199/264: buildconf: use find -execdir instead, remove -print and the ares files, gnunet, 2020/04/30
- [gnurl] 197/264: copyright: bump the copyright year range, gnunet, 2020/04/30
- [gnurl] 202/264: libssh: Use new ECDSA key types to check known hosts, gnunet, 2020/04/30
- [gnurl] 198/264: buildconf: avoid using tempfile when removing files, gnunet, 2020/04/30
- [gnurl] 256/264: copyright updates: adjust year ranges, gnunet, 2020/04/30
- [gnurl] 255/264: CI: do not include */ci branches in PR builds, gnunet, 2020/04/30
- [gnurl] 254/264: runtests: check for the disabled tests relative srcdir, gnunet, 2020/04/30
- [gnurl] 253/264: runtests: revert commenting out a line I did for debugging, gnunet, 2020/04/30
- [gnurl] 261/264: THANKS: synced with the 7.70.0 release, gnunet, 2020/04/30
- [gnurl] 249/264: runtests: when <killserver> mentions http, kill http/2 too,
gnunet <=
- [gnurl] 260/264: headers: copyright range fix, gnunet, 2020/04/30
- [gnurl] 251/264: lib: clean up whitespace, gnunet, 2020/04/30
- [gnurl] 257/264: travis: bump the wolfssl CI build to use 4.4.0, gnunet, 2020/04/30
- [gnurl] 217/264: runtests: use a unix domain socket path with the pid in the name, gnunet, 2020/04/30
- [gnurl] 220/264: ensure all references to ports are replaced by vars, gnunet, 2020/04/30
- [gnurl] 221/264: release-notes.pl: fix parsing typo, gnunet, 2020/04/30
- [gnurl] 222/264: RELEASE-NOTES: synced, gnunet, 2020/04/30
- [gnurl] 225/264: tests: run the TFTP test server on a dynamic port number, gnunet, 2020/04/30
- [gnurl] 172/264: gopher: check remaining time left during write busy loop, gnunet, 2020/04/30
- [gnurl] 187/264: azure: add mqtt support to one of the Windows builds, gnunet, 2020/04/30