Procházet zdrojové kódy

Fix regex in test suite for updated output and keep output of plugin consistent

Dylan Anderson před 1 rokem
rodič
revize
dd0238b0c6
2 změnil soubory, kde provedl 3 přidání a 3 odebrání
  1. 1 1
      plugins-root/check_icmp.c
  2. 2 2
      plugins-root/t/check_icmp.t

+ 1 - 1
plugins-root/check_icmp.c

@@ -1528,7 +1528,7 @@ static void finish(int sig) {
       }
     } else {
       /* !icmp_recv */
-      printf("%s", host->name);
+      printf("%s:", host->name);
       /* rta text output */
       if (rta_mode) {
         if (status == STATE_OK) {

+ 2 - 2
plugins-root/t/check_icmp.t

@@ -18,8 +18,8 @@ if ($allow_sudo eq "yes" or $> == 0) {
 }
 my $sudo = $> == 0 ? '' : 'sudo';
 
-my $successOutput = '/OK - .*?: rta (?:[\d\.]+ms)|(?:nan), lost \d+%/';
-my $failureOutput = '/(WARNING|CRITICAL) - .*?: rta [\d\.]+ms, lost \d%/';
+my $successOutput = '/OK - .*?: rta ((?:[\d\.]+ms)|(?:nan,)) lost \d+%/';
+my $failureOutput = '/(WARNING|CRITICAL) - .*?: ((rta ((?:[\d\.]+ms( >= [\d\.]+ms)?)|(?:nan,)))|(lost \d+%( >= [\d+%])? ))*/';
 
 my $host_responsive    = getTestParameter( "NP_HOST_RESPONSIVE",
 				"The hostname of system responsive to network requests",