File pacemaker#3446-0003-Test-cts-cli-add-more-crm_verify-tests.patch of Package pacemaker.36799
From ed70ec837aee70e51d9952db4ebb6cb8a3a9ec75 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Wed, 1 May 2024 09:25:44 -0500
Subject: [PATCH 3/3] Test: cts-cli: add more crm_verify tests
---
cts/cli/regression.tools.exp | 57 +++++++++++++++++++++---------------
cts/cts-cli.in | 26 +++++++++++-----
2 files changed, 53 insertions(+), 30 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
@@ -5961,7 +5961,7 @@ Transition Summary:
* Move Public-IP ( cluster02 -> cluster01 )
* Move Email ( cluster02 -> cluster01 )
* Stop mysql-proxy:0 ( cluster02 ) due to node availability
- * Stop promotable-rsc:0 ( Promoted cluster02 ) due to node availability
+ * Stop promotable-rsc:0 ( Promoted cluster02 ) due to node availability
Executing Cluster Transition:
* Pseudo action: httpd-bundle-1_stop_0
@@ -7898,7 +7898,22 @@ crm_shadow: Could not access shadow inst
</pacemaker-result>
=#=#=#= End test: Switch to nonexistent shadow instance (force) (XML) - No such object (105) =#=#=#=
* Passed: crm_shadow - Switch to nonexistent shadow instance (force) (XML)
-=#=#=#= Begin test: Verify a file-specified invalid configuration, outputting as xml =#=#=#=
+=#=#=#= Begin test: Verify a file-specified invalid configuration (text output) =#=#=#=
+crm_verify: Errors found during check: config not valid
+-V may provide more details
+=#=#=#= End test: Verify a file-specified invalid configuration (text output) - Invalid configuration (78) =#=#=#=
+* 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
+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)
+=#=#=#= Begin test: Verify a file-specified invalid configuration (quiet text output) =#=#=#=
+=#=#=#= End test: Verify a file-specified invalid configuration (quiet text output) - Invalid configuration (78) =#=#=#=
+* Passed: crm_verify - Verify a file-specified invalid configuration (quiet text output)
+=#=#=#= Begin test: Verify a file-specified invalid configuration (XML output) =#=#=#=
<pacemaker-result api-version="X" request="crm_verify_invalid_bz.xml --output-as=xml">
<status code="78" message="Invalid configuration">
<errors>
@@ -7908,39 +7923,34 @@ crm_shadow: Could not access shadow inst
</errors>
</status>
</pacemaker-result>
-=#=#=#= End test: Verify a file-specified invalid configuration, outputting as xml - Invalid configuration (78) =#=#=#=
-* Passed: crm_verify - Verify a file-specified invalid configuration, outputting as xml
-=#=#=#= Begin test: Verify another file-specified invalid configuration, outputting as xml =#=#=#=
-<pacemaker-result api-version="X" request="crm_verify_invalid_no_stonith.xml --output-as=xml">
+=#=#=#= End test: Verify a file-specified invalid configuration (XML output) - Invalid configuration (78) =#=#=#=
+* Passed: crm_verify - Verify a file-specified invalid configuration (XML output)
+=#=#=#= Begin test: Verify a file-specified invalid configuration (verbose XML output) =#=#=#=
+unpack_config warning: Blind faith: not fencing unseen nodes
+<pacemaker-result api-version="X" request="crm_verify_invalid_bz.xml --output-as=xml --verbose">
<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>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>crm_verify: Errors found during check: config not valid</error>
</errors>
</status>
</pacemaker-result>
-=#=#=#= End test: Verify another file-specified invalid configuration, outputting as xml - Invalid configuration (78) =#=#=#=
-* Passed: crm_verify - Verify another file-specified invalid configuration, outputting as xml
-=#=#=#= Begin test: Verbosely verify a file-specified invalid configuration, outputting as xml =#=#=#=
-unpack_config warning: Blind faith: not fencing unseen nodes
-<pacemaker-result api-version="X" request="crm_verify_invalid_bz.xml --output-as=xml --verbose">
+=#=#=#= End test: Verify a file-specified invalid configuration (verbose XML output) - Invalid configuration (78) =#=#=#=
+* Passed: crm_verify - Verify a file-specified invalid configuration (verbose XML output)
+=#=#=#= Begin test: Verify a file-specified invalid configuration (quiet XML output) =#=#=#=
+<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>crm_verify: Errors found during check: config not valid</error>
</errors>
</status>
</pacemaker-result>
-=#=#=#= End test: Verbosely verify a file-specified invalid configuration, outputting as xml - Invalid configuration (78) =#=#=#=
-* Passed: crm_verify - Verbosely verify a file-specified invalid configuration, outputting as xml
-=#=#=#= Begin test: Verbosely verify another file-specified invalid configuration, outputting as xml =#=#=#=
-(cluster_status@status.c:113) warning: Fencing and resource management disabled due to lack of quorum
-<pacemaker-result api-version="X" request="crm_verify_invalid_no_stonith.xml --output-as=xml --verbose">
+=#=#=#= End test: Verify a file-specified invalid configuration (quiet XML output) - Invalid configuration (78) =#=#=#=
+* Passed: crm_verify - Verify a file-specified invalid configuration (quiet XML output)
+=#=#=#= Begin test: Verify another file-specified invalid configuration (XML output) =#=#=#=
+<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>
@@ -7952,8 +7962,8 @@ unpack_config warning: Blind faith: not
</errors>
</status>
</pacemaker-result>
-=#=#=#= End test: Verbosely verify another file-specified invalid configuration, outputting as xml - Invalid configuration (78) =#=#=#=
-* Passed: crm_verify - Verbosely verify another file-specified invalid configuration, outputting as xml
+=#=#=#= End test: Verify another file-specified invalid configuration (XML output) - Invalid configuration (78) =#=#=#=
+* Passed: crm_verify - Verify another file-specified invalid configuration (XML output)
=#=#=#= Begin test: Verify a file-specified valid configuration, outputting as xml =#=#=#=
<pacemaker-result api-version="X" request="crm_mon.xml --output-as=xml">
<status code="0" message="OK"/>
Index: pacemaker-2.1.7+20231219.0f7f88312/cts/cts-cli.in
===================================================================
--- pacemaker-2.1.7+20231219.0f7f88312.orig/cts/cts-cli.in
+++ pacemaker-2.1.7+20231219.0f7f88312/cts/cts-cli.in
@@ -2293,20 +2293,32 @@ function test_tools() {
CIB_file_invalid_1="$test_home/cli/crm_verify_invalid_bz.xml"
CIB_file_invalid_2="$test_home/cli/crm_verify_invalid_no_stonith.xml"
- desc="Verify a file-specified invalid configuration, outputting as xml"
+ desc="Verify a file-specified invalid configuration (text output)"
+ cmd="crm_verify --xml-file '$CIB_file_invalid_1'"
+ test_assert $CRM_EX_CONFIG 0
+
+ desc="Verify a file-specified invalid configuration (verbose text output)"
+ cmd="crm_verify --xml-file '$CIB_file_invalid_1' --verbose"
+ test_assert $CRM_EX_CONFIG 0
+
+ desc="Verify a file-specified invalid configuration (quiet text output)"
+ cmd="crm_verify --xml-file '$CIB_file_invalid_1' --quiet"
+ test_assert $CRM_EX_CONFIG 0
+
+ desc="Verify a file-specified invalid configuration (XML output)"
cmd="crm_verify --xml-file '$CIB_file_invalid_1' --output-as=xml"
test_assert_validate $CRM_EX_CONFIG 0
- desc="Verify another file-specified invalid configuration, outputting as xml"
- cmd="crm_verify --xml-file '$CIB_file_invalid_2' --output-as=xml"
+ desc="Verify a file-specified invalid configuration (verbose XML output)"
+ cmd="crm_verify --xml-file '$CIB_file_invalid_1' --output-as=xml --verbose"
test_assert_validate $CRM_EX_CONFIG 0
- desc="Verbosely verify a file-specified invalid configuration, outputting as xml"
- cmd="crm_verify --xml-file '$CIB_file_invalid_1' --output-as=xml --verbose"
+ desc="Verify a file-specified invalid configuration (quiet XML output)"
+ cmd="crm_verify --xml-file '$CIB_file_invalid_1' --output-as=xml --quiet"
test_assert_validate $CRM_EX_CONFIG 0
- desc="Verbosely verify another file-specified invalid configuration, outputting as xml"
- cmd="crm_verify --xml-file '$CIB_file_invalid_2' --output-as=xml --verbose"
+ desc="Verify another file-specified invalid configuration (XML output)"
+ cmd="crm_verify --xml-file '$CIB_file_invalid_2' --output-as=xml"
test_assert_validate $CRM_EX_CONFIG 0
export CIB_file="$test_home/cli/crm_mon.xml"
