48 lines
2.1 KiB
Diff
48 lines
2.1 KiB
Diff
From ca4ac6c06dd37deab5ba7c4df8789acf9e45d03e Mon Sep 17 00:00:00 2001
|
|
From: Florence Blanc-Renaud <flo@redhat.com>
|
|
Date: Thu, 28 Sep 2023 12:48:37 +0200
|
|
Subject: [PATCH] ipatests: fix healthcheck test for --indent option
|
|
|
|
ipa-healthcheck --indent option expects an integer. The error
|
|
message changed with ipa-healthcheck 0.13.
|
|
Recent versions also check that the value is in the range 0-32.
|
|
|
|
The test must be compatible with old and new versions.
|
|
|
|
Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
|
|
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
|
|
---
|
|
ipatests/test_integration/test_ipahealthcheck.py | 13 ++++++++++---
|
|
1 file changed, 10 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/ipatests/test_integration/test_ipahealthcheck.py b/ipatests/test_integration/test_ipahealthcheck.py
|
|
index 822f550d2ee241a9dd14c99d75199e6207b78e9c..35fcfe10508589ded021207a4eba4fb0143495b4 100644
|
|
--- a/ipatests/test_integration/test_ipahealthcheck.py
|
|
+++ b/ipatests/test_integration/test_ipahealthcheck.py
|
|
@@ -2412,12 +2412,19 @@ class TestIpaHealthCLI(IntegrationTest):
|
|
cmd = self.base_cmd + ["--indent", option]
|
|
result = self.master.run_command(cmd, raiseonerr=False)
|
|
assert result.returncode == 2
|
|
- assert 'invalid int value' in result.stderr_text
|
|
+ assert ('invalid int value' in result.stderr_text
|
|
+ or 'is not an integer' in result.stderr_text)
|
|
|
|
- # unusual success, arguably odd but not invalid :-)
|
|
+ version = tasks.get_healthcheck_version(self.master)
|
|
for option in ('-1', '5000'):
|
|
cmd = self.base_cmd + ["--indent", option]
|
|
- result = self.master.run_command(cmd)
|
|
+ result = self.master.run_command(cmd, raiseonerr=False)
|
|
+ if parse_version(version) >= parse_version('0.13'):
|
|
+ assert result.returncode == 2
|
|
+ assert 'is not in the range 0-32' in result.stderr_text
|
|
+ else:
|
|
+ # Older versions did not check for a given allowed range
|
|
+ assert result.returncode == 0
|
|
|
|
def test_severity(self):
|
|
"""
|
|
--
|
|
2.41.0
|
|
|