Adjust tests for new perfdata output.

diff --git a/t/02_autovac_freeze.t b/t/02_autovac_freeze.t
index eacdae06ec30366127f960e2af54ef503aa6b8bd..9f692071f596dc5d4d1f7b98e8755add9c5578c9 100644 (file)
--- a/t/02_autovac_freeze.t
+++ b/t/02_autovac_freeze.t
@@ -44,10 +44,10 @@ $t=qq{$S fails when called with an invalid --critical option};
 like ($cp->run('--critical=50'), qr{ERROR:.+must be a percentage}, $t);
 
 $t=qq{$S flags when database is over freeze threshold};
-like ($cp->run('-w 0%'), qr{$label WARNING:.*'ardala'=\d+%.*?'beedeebeedee'=\d+%.*?'postgres'=\d+%.*?'template1'=\d+%}, $t);
+like ($cp->run('-w 0%'), qr{$label WARNING:.*ardala=\d+%.*?beedeebeedee=\d+%.*?postgres=\d+%.*?template1=\d+%}, $t);
 
 $t=qq{$S flags when database is under freeze threshold};
-like ($cp->run('-w 99%'), qr{$label OK:.*'ardala'=\d+%.*?'beedeebeedee'=\d+%.*?'postgres'=\d+%.*?'template1'=\d+%}, $t);
+like ($cp->run('-w 99%'), qr{$label OK:.*ardala=\d+%.*?beedeebeedee=\d+%.*?postgres=\d+%.*?template1=\d+%}, $t);
 
 $t=qq{$S produces MRTG output};
 like ($cp->run('--output=mrtg -w 99%'), qr{0\n\d+\n\nardala \| beedeebeedee}, $t);

diff --git a/t/02_backends.t b/t/02_backends.t
index 3173d4c941f860c6e97bfe4f72c0f813da656fec..dbc94ef9810fbd4bf30065bb77e57e6cc6a11e50 100644 (file)
--- a/t/02_backends.t
+++ b/t/02_backends.t
@@ -51,7 +51,7 @@ SKIP: {
     like ($result, qr{^$label OK: \(host:$host\).* 2 of 10 connections \(20%\)}, $t);
 
     $t=qq{$S returned correct performance data};
-    like ($result, qr{ \| time=(\d\.\d\d)  'ardala'=0;9;9;0;10 'beedeebeedee'=0;9;9;0;10 'postgres'=2;9;9;0;10 'template0'=0;9;9;0;10 'template1'=0;9;9;0;10\s$}, $t);
+    like ($result, qr{ \| time=\d\.\d\ds ardala=0;9;9;0;10 beedeebeedee=0;9;9;0;10 postgres=2;9;9;0;10 template0=0;9;9;0;10 template1=0;9;9;0;10\s$}, $t);
 }
 
 $t=qq{$S fails when called with an invalid option};
@@ -173,7 +173,7 @@ SKIP: {
     like ($cp->run('--include=postgres --exclude=postgres'), qr{^$label OK: .+3 of 10}, $t);
 
     $t=qq{$S returned correct performance data with include};
-    like ($cp->run('--include=postgres'), qr{ \| time=(\d\.\d\d)  'ardala'=0;9;9;0;10 'beedeebeedee'=0;9;9;0;10 'postgres'=3;9;9;0;10}, $t);
+    like ($cp->run('--include=postgres'), qr{ \| time=\d\.\d\ds ardala=0;9;9;0;10 beedeebeedee=0;9;9;0;10 postgres=3;9;9;0;10}, $t);
 }
 
 my %dbh;

diff --git a/t/02_connection.t b/t/02_connection.t
index 7719e27c0531568eb5baa89bba2ca4315c585a21..6e1c5115895aa5964ae0f277df333b2f0297b3e2 100644 (file)
--- a/t/02_connection.t
+++ b/t/02_connection.t
@@ -29,10 +29,10 @@ $t=qq{$S returned expected text and OK value};
 like ($result, qr{^$label OK:}, $t);
 
 $t=qq{$S returned correct performance data};
-like ($result, qr{ \| time=(?:\d\.\d\d)\s$}, $t);
+like ($result, qr{ \| time=\d\.\d\ds\s$}, $t);
 
 $t=qq{$S returned correct version};
-like ($result, qr{ \| time=(?:\d\.\d\d)\s$}, $t);
+like ($result, qr{ \| time=\d\.\d\ds\s$}, $t);
 
 $t=qq{$S fails when called with an invalid option};
 like ($cp->run('foobar=12'), qr{^\s*Usage:}, $t);

diff --git a/t/02_database_size.t b/t/02_database_size.t
index 93ebad29192befb70c7e4d92795a058402d1bd9d..0aa6d9d49fb7f77b0e38f7dd51ce419e5e909c6b 100644 (file)
--- a/t/02_database_size.t
+++ b/t/02_database_size.t
@@ -111,7 +111,7 @@ $t=qq{$S works when exclude and include make a match};
 like ($cp->run('-w 5g --include=postgres --exclude=postgres'), qr{$label OK: DB "postgres"}, $t);
 
 $t=qq{$S returned correct performance data with include};
-like ($cp->run('-w 5g --include=postgres'), qr{ \| time=\d\.\d\d  postgres=\d+}, $t);
+like ($cp->run('-w 5g --include=postgres'), qr{ \| time=\d\.\d\ds postgres=\d+}, $t);
 
 $t=qq{$S with includeuser option returns nothing};
 like ($cp->run('--includeuser postgres --includeuser mycatbeda -w 10g'), qr{No matching entries found due to user exclusion}, $t);

diff --git a/t/02_relation_size.t b/t/02_relation_size.t
index 17fad03da446509f0ae5d419a9ff6daa920bc3f0..f13d914aaca57aa7c1077c0f4e79db4ec4f16318 100644 (file)
--- a/t/02_relation_size.t
+++ b/t/02_relation_size.t
@@ -55,10 +55,10 @@ $t = qq{$S identifies host};
 like ($result, qr{host:$host}, $t);
 
 $t = qq{$S processes 'perflimit=1'};
-like ($cp->run(q{-w 1 --perflimit 1}), qr{time=\d+\.\d\d(?:\s+(?:\w+\.)?\w+=\d+){1}\s+\Z}, $t);
+like ($cp->run(q{-w 1 --perflimit 1}), qr{time=\d+\.\d\ds \w+\.\w+=\d+B;1\s+\Z}, $t);
 
 $t = qq{$S processes 'perflimit=2'};
-like ($cp->run(q{-w 1 --perflimit 2}), qr{time=\d+\.\d\d(?:\s+(?:\w+\.)?\w+=\d+){2}\s+\Z}, $t);
+like ($cp->run(q{-w 1 --perflimit 2}), qr{time=\d+\.\d\ds \w+\.\w+=\d+B;1 \w+\.\w+=\d+B}, $t);
 
 $t = qq{$S detects no matching tables due to unknown user};
 like ($cp->run(q{-w 1 --includeuser foo}), qr{$label OK:.*No matching entries found due to user exclusion/inclusion options}, $t);

diff --git a/t/02_slony_status.t b/t/02_slony_status.t
index 0b335bb9e3fc3c8f345f36764730e68a1f4970c5..325bec716fdb6815c32d4fe1e325d204cdfcbec1 100644 (file)
--- a/t/02_slony_status.t
+++ b/t/02_slony_status.t
@@ -62,46 +62,46 @@ my $res = $cp->run('-w 230 --schema slony_testing');
 like ($res, qr{$label OK:.*\b123\b}, $t);
 
 $t=qq{$S reports correct stats for raw seconds warning input};
-like ($res, qr{\| time=\d+\.\d+ 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;230;\s*$}, $t);
+like ($res, qr{\| time=\d+\.\d+s 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;230\s*$}, $t);
 
 $t=qq{$S reports warning correctly for raw seconds};
 $res = $cp->run('-w 30');
 like ($res, qr{$label WARNING:.*\b123\b}, $t);
 
 $t=qq{$S reports correct stats for raw seconds warning input};
-like ($res, qr{\| time=\d+\.\d+ 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;30;\s*$}, $t);
+like ($res, qr{\| time=\d+\.\d+s 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;30\s*$}, $t);
 
 $t=qq{$S reports warning correctly for minutes input};
 $res = $cp->run('-w "1 minute"');
 like ($res, qr{$label WARNING:.*\b123\b}, $t);
 
 $t=qq{$S reports correct stats for minutes warning input};
-like ($res, qr{\| time=\d+\.\d+ 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;60;\s*$}, $t);
+like ($res, qr{\| time=\d+\.\d+s 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;60\s*$}, $t);
 
 $t=qq{$S reports okay when lag threshhold not reached, with critical};
 $res = $cp->run('-c 235');
 like ($res, qr{$label OK:.*\b123\b}, $t);
 
 $t=qq{$S reports correct stats for raw seconds critical input};
-like ($res, qr{\| time=\d+\.\d+ 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;;235\s*$}, $t);
+like ($res, qr{\| time=\d+\.\d+s 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;;235\s*$}, $t);
 
 $t=qq{$S reports critical correctly for raw seconds};
 $res = $cp->run('-c 35');
 like ($res, qr{$label CRITICAL:.*\b123\b}, $t);
 
 $t=qq{$S reports correct stats for raw seconds critical input};
-like ($res, qr{\| time=\d+\.\d+ 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;;35\s*$}, $t);
+like ($res, qr{\| time=\d+\.\d+s 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;;35\s*$}, $t);
 
 $t=qq{$S reports critical correctly for minutes input};
 $res = $cp->run('-c "1 minute"');
 like ($res, qr{$label CRITICAL:.*\b123\b}, $t);
 
 $t=qq{$S reports correct stats for minutes critical input};
-like ($res, qr{\| time=\d+\.\d+ 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;;60\s*$}, $t);
+like ($res, qr{\| time=\d+\.\d+s 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;;60\s*$}, $t);
 
 $t=qq{$S reports correct stats for both warning and critical};
 $res = $cp->run('-c "3 days" -w "23 hours"');
-like ($res, qr{\| time=\d+\.\d+ 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;82800;259200\s*$}, $t);
+like ($res, qr{\| time=\d+\.\d+s 'postgres Node 1\(First node\) -> Node 2\(Second node\)'=123;82800;259200\s*$}, $t);
 
 cleanup_schema();
 

diff --git a/t/02_txn_wraparound.t b/t/02_txn_wraparound.t
index 987612dea7c138a19180dd59b100b4bf2f788823..ed6305e5055ed171641c36d858b8987f8111fe6c 100644 (file)
--- a/t/02_txn_wraparound.t
+++ b/t/02_txn_wraparound.t
@@ -29,8 +29,8 @@ $result = $cp->run();
 like ($result, qr{^$label}, $t);
 
 $t = qq{$S identifies each database};
-like ($result, qr{'ardala'=\d+;1300000000;1400000000;0;2000000000 'beedeebeedee'=\d+;1300000000;1400000000;0;2000000000 'postgres'=\d+;1300000000;1400000000;0;2000000000 'template1'=\d+;1300000000;1400000000;0;2000000000}, $t);
-$result =~ /'ardala'=(\d+)/;
+like ($result, qr{ardala=\d+;1300000000;1400000000;0;2000000000 beedeebeedee=\d+;1300000000;1400000000;0;2000000000 postgres=\d+;1300000000;1400000000;0;2000000000 template1=\d+;1300000000;1400000000;0;2000000000}, $t);
+$result =~ /ardala=(\d+)/;
 my $txn_measure = $1;
 
 $t = qq{$S identifies host};