From 7b3cf2593a770fd50c86d62667263b70db818860 Mon Sep 17 00:00:00 2001 From: David Schweikert Date: Wed, 29 Dec 2021 15:50:29 +0100 Subject: [PATCH] fix travis build --- CHANGELOG.md | 3 +++ ci/test-04-options-a-b.pl | 2 +- ci/test-14-ping-internet-hosts.pl | 3 +-- ci/test-15-netdata.pl | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e107dc7..3087bae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +fping 5.1 (UNRELEASED) +====================== + fping 5.0 (2020-08-05) ====================== diff --git a/ci/test-04-options-a-b.pl b/ci/test-04-options-a-b.pl index 46f3522..082ac0a 100755 --- a/ci/test-04-options-a-b.pl +++ b/ci/test-04-options-a-b.pl @@ -94,5 +94,5 @@ $cmd->stderr_like(qr{^(|(8.8.8.7: error while sending ping: No route to host\n)+ my $elapsed = tv_interval($t0); # 0.1 + 0.2 + 0.4 + 0.8 = 1.5 cmp_ok($elapsed, '>=', 1.5); -cmp_ok($elapsed, '<', 1.8); +cmp_ok($elapsed, '<', 1.9); } diff --git a/ci/test-14-ping-internet-hosts.pl b/ci/test-14-ping-internet-hosts.pl index 1de24fb..8b645e0 100755 --- a/ci/test-14-ping-internet-hosts.pl +++ b/ci/test-14-ping-internet-hosts.pl @@ -15,11 +15,10 @@ my $re_num = qr{\d+(?:\.\d+)?}; # fping { -my $cmd = Test::Command->new(cmd => "fping -q -i 10 -p 20 -c 3 -t200 8.8.8.8 4.2.2.5 www.france-telecom.fr www.google.com"); +my $cmd = Test::Command->new(cmd => "fping -q -i 10 -p 20 -c 3 -t200 8.8.8.8 www.france-telecom.fr www.google.com"); $cmd->exit_is_num(0); $cmd->stdout_is_eq(""); $cmd->stderr_like(qr{8\.8\.8\.8\s*: xmt/rcv/%loss = [123]/3/\d+%, min/avg/max = $re_num/$re_num/$re_num -4\.2\.2\.5\s*: xmt/rcv/%loss = [123]/3/\d+%, min/avg/max = $re_num/$re_num/$re_num www\.france-telecom\.fr\s*: xmt/rcv/%loss = [123]/3/\d+%, min/avg/max = $re_num/$re_num/$re_num www\.google\.com\s*: xmt/rcv/%loss = [123]/3/\d+%, min/avg/max = $re_num/$re_num/$re_num }); diff --git a/ci/test-15-netdata.pl b/ci/test-15-netdata.pl index 80c5a51..da20636 100755 --- a/ci/test-15-netdata.pl +++ b/ci/test-15-netdata.pl @@ -9,19 +9,19 @@ plan tests => 3; { my $cmd = Test::Command->new(cmd => "fping -c 2 -Q 1 -N 127.0.0.1"); $cmd->exit_is_num(0); -$cmd->stdout_like(qr{CHART fping\.127_0_0_1_packets '' 'FPing Packets for host 127\.0\.0\.1' packets '127_0_0_1' fping\.packets line 110020 1 +$cmd->stdout_like(qr{CHART fping\.127_0_0_1_packets '' 'FPing Packets for host 127\.0\.0\.1' packets '127.0.0.1' fping\.packets line 110020 1 DIMENSION xmt sent absolute 1 1 DIMENSION rcv received absolute 1 1 BEGIN fping\.127_0_0_1_packets SET xmt = 1 SET rcv = 1 END -CHART fping\.127_0_0_1_quality '' 'FPing Quality for host 127\.0\.0\.1' percentage '127_0_0_1' fping\.quality area 110010 1 +CHART fping\.127_0_0_1_quality '' 'FPing Quality for host 127\.0\.0\.1' percentage '127.0.0.1' fping\.quality area 110010 1 DIMENSION returned '' absolute 1 1 BEGIN fping\.127_0_0_1_quality SET returned = 100 END -CHART fping\.127_0_0_1_latency '' 'FPing Latency for host 127\.0\.0\.1' ms '127_0_0_1' fping\.latency area 110000 1 +CHART fping\.127_0_0_1_latency '' 'FPing Latency for host 127\.0\.0\.1' ms '127.0.0.1' fping\.latency area 110000 1 DIMENSION min minimum absolute 1 1000000 DIMENSION max maximum absolute 1 1000000 DIMENSION avg average absolute 1 1000000 -- 2.43.0