File pacemaker#3543-0002-Test-cts-cli-update-expected-output-for-crm_verify-t.patch of Package pacemaker.36799
From b95ea85430dae0caea28826d33411d980c4ea8a3 Mon Sep 17 00:00:00 2001
From: "Gao,Yan" <ygao@suse.com>
Date: Wed, 19 Jun 2024 10:19:57 +0200
Subject: [PATCH 2/2] Test: cts-cli: update expected output for crm_verify to
distinguish configuration warnings and errors
---
cts/cli/regression.tools.exp | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
Index: pacemaker-2.1.7+20231219.0f7f88312/cts/cli/regression.tools.exp
===================================================================
--- pacemaker-2.1.7+20231219.0f7f88312.orig/cts/cli/regression.tools.exp
+++ pacemaker-2.1.7+20231219.0f7f88312/cts/cli/regression.tools.exp
@@ -7905,8 +7905,8 @@ crm_verify: Errors found during check: c
* Passed: crm_verify - Verify a file-specified invalid configuration (text output)
=#=#=#= Begin test: Verify a file-specified invalid configuration (verbose text output) =#=#=#=
unpack_config warning: Blind faith: not fencing unseen nodes
-Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource
-Ignoring <clone> resource 'test2-clone' because configuration is invalid
+error: Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource
+error: Ignoring <clone> resource 'test2-clone' because configuration is invalid
crm_verify: Errors found during check: config not valid
=#=#=#= End test: Verify a file-specified invalid configuration (verbose text output) - Invalid configuration (78) =#=#=#=
* Passed: crm_verify - Verify a file-specified invalid configuration (verbose text output)
@@ -7917,8 +7917,8 @@ crm_verify: Errors found during check: c
<pacemaker-result api-version="X" request="crm_verify_invalid_bz.xml --output-as=xml">
<status code="78" message="Invalid configuration">
<errors>
- <error>Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource</error>
- <error>Ignoring <clone> resource 'test2-clone' because configuration is invalid</error>
+ <error>error: Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource</error>
+ <error>error: Ignoring <clone> resource 'test2-clone' because configuration is invalid</error>
<error>crm_verify: Errors found during check: config not valid</error>
</errors>
</status>
@@ -7930,8 +7930,8 @@ unpack_config warning: Blind faith: not
<pacemaker-result api-version="X" request="crm_verify_invalid_bz.xml --output-as=xml --verbose">
<status code="78" message="Invalid configuration">
<errors>
- <error>Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource</error>
- <error>Ignoring <clone> resource 'test2-clone' because configuration is invalid</error>
+ <error>error: Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource</error>
+ <error>error: Ignoring <clone> resource 'test2-clone' because configuration is invalid</error>
<error>crm_verify: Errors found during check: config not valid</error>
</errors>
</status>
@@ -7942,8 +7942,8 @@ unpack_config warning: Blind faith: not
<pacemaker-result api-version="X" request="crm_verify_invalid_bz.xml --output-as=xml --quiet">
<status code="78" message="Invalid configuration">
<errors>
- <error>Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource</error>
- <error>Ignoring <clone> resource 'test2-clone' because configuration is invalid</error>
+ <error>error: Resource test2:0 is of type systemd and therefore cannot be used as a promotable clone resource</error>
+ <error>error: Ignoring <clone> resource 'test2-clone' because configuration is invalid</error>
</errors>
</status>
</pacemaker-result>
@@ -7953,11 +7953,11 @@ unpack_config warning: Blind faith: not
<pacemaker-result api-version="X" request="crm_verify_invalid_no_stonith.xml --output-as=xml">
<status code="78" message="Invalid configuration">
<errors>
- <error>Resource start-up disabled since no STONITH resources have been defined</error>
- <error>Either configure some or disable STONITH with the stonith-enabled option</error>
- <error>NOTE: Clusters with shared data need STONITH to ensure data integrity</error>
- <error>Node pcmk-1 is unclean but cannot be fenced</error>
- <error>Node pcmk-2 is unclean but cannot be fenced</error>
+ <error>error: Resource start-up disabled since no STONITH resources have been defined</error>
+ <error>error: Either configure some or disable STONITH with the stonith-enabled option</error>
+ <error>error: NOTE: Clusters with shared data need STONITH to ensure data integrity</error>
+ <error>warning: Node pcmk-1 is unclean but cannot be fenced</error>
+ <error>warning: Node pcmk-2 is unclean but cannot be fenced</error>
<error>crm_verify: Errors found during check: config not valid</error>
</errors>
</status>
