The wal_files check must take a positive integer, not just any ol' integer.

diff --git a/check_postgres.pl b/check_postgres.pl
index 478726f77bbef2a614ed2619d0dbdc610c5dcd25..5243dfc06309692d376a521008a3618f1d2770b5 100755 (executable)
--- a/check_postgres.pl
+++ b/check_postgres.pl
@@ -7331,7 +7331,7 @@ sub check_wal_files {
     ## Critical and warning are the number of files
     ## Example: --critical=40
 
-    my ($warning, $critical) = validate_range({type => 'integer', leastone => 1});
+    my ($warning, $critical) = validate_range({type => 'positive integer', leastone => 1});
 
     ## Figure out where the pg_xlog directory is
     $SQL = q{SELECT count(*) AS count FROM pg_ls_dir('pg_xlog') WHERE pg_ls_dir ~ E'^[0-9A-F]{24}$'}; ## no critic (RequireInterpolationOfMetachars)

diff --git a/t/02_wal_files.t b/t/02_wal_files.t
index c0d0995a7d4fc80c548a8375cedfd8edc038b23c..f1d14c58bed9a3b4d1bee510e85350c5b3415ba7 100644 (file)
--- a/t/02_wal_files.t
+++ b/t/02_wal_files.t
@@ -23,8 +23,8 @@ $t=qq{$S fails when called with an invalid option};
 like ($cp->run('foobar=12'), qr{^\s*Usage:}, $t);
 
 $t=qq{$S fails when called with an invalid option};
-like ($cp->run('--warning=30%'), qr{ERROR:.+must be an integer}, $t);
-like ($cp->run('--warning=-30'), qr{ERROR:.+must be an integer}, $t);
+like ($cp->run('--warning=30%'), qr{ERROR:.+must be a positive integer}, $t);
+like ($cp->run('--warning=-30'), qr{ERROR:.+must be a positive integer}, $t);
 
 my $ver = $dbh->{pg_server_version};
 if ($ver < 80100) {
@@ -41,11 +41,11 @@ if ($ver < 80100) {
 
 $t=qq{$S works as expected for warnings};
 like ($cp->run('--warning=30'), qr{^$label OK}, $t);
-like ($cp->run('--warning=0'), qr{^$label WARNING}, $t);
+like ($cp->run('--warning=1'), qr{^$label WARNING}, $t);
 
 $t=qq{$S works as expected for criticals};
 like ($cp->run('--critical=30'), qr{^$label OK}, $t);
-like ($cp->run('--critical=0'), qr{^$label CRITICAL}, $t);
+like ($cp->run('--critical=1'), qr{^$label CRITICAL}, $t);
 
 $cp->drop_schema_if_exists();
 $cp->create_fake_pg_table('pg_ls_dir', 'text');