summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Sabino Mullane2011-01-25 05:18:10 +0000
committerGreg Sabino Mullane2011-01-25 05:18:10 +0000
commit89653cc88b3102974e82d19b046c64b06ac230e1 (patch)
treec142b87670379b02e96102b47b3f5a4ec971724f
parent3ac63d663bc639768cae2c406ba1bbda880a8c47 (diff)
Make new_version_cp test work correctly for dot-zero revisions.
-rw-r--r--t/02_new_version_cp.t14
1 files changed, 12 insertions, 2 deletions
diff --git a/t/02_new_version_cp.t b/t/02_new_version_cp.t
index 58bfda010..53dd86335 100644
--- a/t/02_new_version_cp.t
+++ b/t/02_new_version_cp.t
@@ -34,8 +34,18 @@ $cp->fake_self_version($current_version);
like ($cp->run(''), qr{$label OK: Version $current_version is the latest for check_postgres}, $t);
$t=qq{$S returns critical for mismatched revision};
-$cp->fake_self_version($cmaj . ($crev==0 ? 99 : $crev-1));
-like ($cp->run(''), qr{$label CRITICAL: Please upgrade to version \d+\.\d+\.\d+ of check_postgres. You are running \d+\.\d+\.\d+}, $t);
+my $warncrit;
+if ($crev==0) {
+ $crev = 99;
+ $cmaj--;
+ $warncrit = 'WARNING';
+}
+else {
+ $crev--;
+ $warncrit = 'CRITICAL';
+}
+$cp->fake_self_version("$cmaj.$crev");
+like ($cp->run(''), qr{$label $warncrit: Please upgrade to version \d+\.\d+\.\d+ of check_postgres. You are running \d+\.\d+\.\d+}, $t);
$cp->restore_self_version();