luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: improve mqtt server handling

Browse Source 
Check that the mqtt server process actually is running.
Handle its port number similar to other servers.

Closes #15059
This commit is contained in:
Stefan Eissing 2024-09-26 15:00:27 +02:00 committed by Daniel Stenberg
parent e61c5eb417
commit 841fbdb63c
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tests/servers.pm
View File

@ -908,6 +908,20 @@ sub verifyhttptls {
return $pid; return $pid;
} }
#######################################################################
# STUB for verifying mqtt
#
sub verifymqtt {
my ($proto, $ipvnum, $idnum, $ip, $port) = @_;
my $pidfile = server_pidfilename("$LOGDIR/$PIDDIR", $proto, $ipvnum,
$idnum);
my $pid = processexists($pidfile);
if($pid < 0) {
logmsg "RUN: MQTT server has died after starting up\n";
}
return $pid;
}
####################################################################### #######################################################################
# STUB for verifying socks # STUB for verifying socks
# #
@ -1064,6 +1078,7 @@ my %protofunc = ('http' => \&verifyhttp,
'ftps' => \&verifyftp, 'ftps' => \&verifyftp,
'pop3s' => \&verifyftp, 'pop3s' => \&verifyftp,
'imaps' => \&verifyftp, 'imaps' => \&verifyftp,
'mqtt' => \&verifymqtt,
'smtps' => \&verifyftp, 'smtps' => \&verifyftp,
'tftp' => \&verifyftp, 'tftp' => \&verifyftp,
'ssh' => \&verifyssh, 'ssh' => \&verifyssh,
@ -1952,13 +1967,12 @@ sub runmqttserver {
} }
my $mqttport = pidfromfile($portfile); my $mqttport = pidfromfile($portfile);
$PORT{"mqtt"} = $mqttport;
if($verb) { if($verb) {
logmsg "RUN: $srvrname server is now running PID $pid2 on PORT $mqttport\n"; logmsg "RUN: $srvrname server is now running PID $pid2 on PORT $mqttport\n";
} }
return (0, $pid2, $sockspid); return (0, $pid2, $sockspid, $mqttport);
} }
####################################################################### #######################################################################
@ -2240,6 +2254,19 @@ sub responsive_http_server {
return &responsiveserver($proto, $ipvnum, $idnum, $ip, $port_or_path, $do_http3); return &responsiveserver($proto, $ipvnum, $idnum, $ip, $port_or_path, $do_http3);
} }
#######################################################################
# Single shot mqtt server responsiveness test. This should only
# be used to verify that a server present in %run hash is still functional
#
sub responsive_mqtt_server {
my ($proto, $id, $verb, $ipv6) = @_;
my $ip = ($ipv6 && ($ipv6 =~ /6$/)) ? "$HOST6IP" : "$HOSTIP";
my $ipvnum = ($ipv6 && ($ipv6 =~ /6$/)) ? 6 : 4;
my $idnum = ($id && ($id =~ /^(\d+)$/) && ($id > 1)) ? $id : 1;
return &responsiveserver($proto, $ipvnum, $idnum, $ip);
}
####################################################################### #######################################################################
# Single shot pingpong server responsiveness test. This should only be # Single shot pingpong server responsiveness test. This should only be
# used to verify that a server present in %run hash is still functional # used to verify that a server present in %run hash is still functional
@ -2876,8 +2903,14 @@ sub startservers {
} }
} }
elsif($what eq "mqtt" ) { elsif($what eq "mqtt" ) {
if($run{'mqtt'} &&
!responsive_mqtt_server("mqtt", "", $verbose)) {
if(stopserver('mqtt')) {
return ("failed stopping unresponsive MQTT server", 3);
}
}
if(!$run{'mqtt'}) { if(!$run{'mqtt'}) {
($serr, $pid, $pid2) = runmqttserver("", $verbose); ($serr, $pid, $pid2, $PORT{"mqtt"}) = runmqttserver("", $verbose);
if($pid <= 0) { if($pid <= 0) {
return ("failed starting mqtt server", $serr); return ("failed starting mqtt server", $serr);
} }