From 0c2eab4dd768335e0212e79730f6cf17a318fe1c Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Thu, 19 Jan 2017 12:11:38 -0600
Subject: [PATCH 1/2] Test: tools: ignore source code line numbers when
comparing validation output
---
tools/regression.sh | 1 +
tools/regression.validity.exp | 156 +++++++++++++++++++++---------------------
2 files changed, 79 insertions(+), 78 deletions(-)
diff --git a/tools/regression.sh b/tools/regression.sh
index 47bff43..edc5e6b 100755
--- a/tools/regression.sh
+++ b/tools/regression.sh
@@ -755,6 +755,7 @@ for t in $tests; do
-e 's/ last-rc-change=\"[0-9]*\"//'\
-e 's|^/tmp/[0-9][0-9]*\.||'\
-e 's/^Entity: line [0-9][0-9]*: //'\
+ -e 's/schemas\.c:\([0-9][0-9]*\)/schemas.c:NNN/' \
-e 's/\(validation ([0-9][0-9]* of \)[0-9][0-9]*\().*\)/\1X\2/' $test_home/regression.$t.out
if [ $do_save = 1 ]; then
diff --git a/tools/regression.validity.exp b/tools/regression.validity.exp
index 827b660..1278a09 100644
--- a/tools/regression.validity.exp
+++ b/tools/regression.validity.exp
@@ -22,46 +22,46 @@ Call failed: Update does not conform to the configured schema
=#=#=#= End test: Try to make resulting CIB invalid (enum violation) - Update does not conform to the configured schema (203) =#=#=#=
* Passed: cibadmin - Try to make resulting CIB invalid (enum violation)
=#=#=#= Begin test: Run crm_simulate with invalid CIB (enum violation) =#=#=#=
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-1.2' validation (4 of X)
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-1.2' validation (4 of X)
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
-( schemas.c:760 ) trace: update_validation: pacemaker-1.2 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-1.3' validation (5 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-1.2 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-1.3' validation (5 of X)
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
-( schemas.c:760 ) trace: update_validation: pacemaker-1.3 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.0' validation (6 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-1.3 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.0' validation (6 of X)
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
-( schemas.c:760 ) trace: update_validation: pacemaker-2.0 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.1' validation (7 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.0 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.1' validation (7 of X)
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
-( schemas.c:760 ) trace: update_validation: pacemaker-2.1 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.2' validation (8 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.1 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.2' validation (8 of X)
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
-( schemas.c:760 ) trace: update_validation: pacemaker-2.2 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.3' validation (9 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.2 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.3' validation (9 of X)
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
-( schemas.c:760 ) trace: update_validation: pacemaker-2.3 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.4' validation (10 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.3 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.4' validation (10 of X)
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
-( schemas.c:760 ) trace: update_validation: pacemaker-2.4 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.5' validation (11 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.4 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.5' validation (11 of X)
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
-( schemas.c:760 ) trace: update_validation: pacemaker-2.5 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.6' validation (12 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.5 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.6' validation (12 of X)
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
-( schemas.c:760 ) trace: update_validation: pacemaker-2.6 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.7' validation (13 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.6 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.7' validation (13 of X)
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
-( schemas.c:760 ) trace: update_validation: pacemaker-2.7 validation failed
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.7 validation failed
Your current configuration pacemaker-1.2 could not validate with any schema in range [pacemaker-1.2, pacemaker-2.7], cannot upgrade to pacemaker-2.0.
=#=#=#= End test: Run crm_simulate with invalid CIB (enum violation) - Required key not available (126) =#=#=#=
* Passed: crm_simulate - Run crm_simulate with invalid CIB (enum violation)
@@ -85,57 +85,57 @@ Call failed: Update does not conform to the configured schema
=#=#=#= End test: Try to make resulting CIB invalid (unrecognized validate-with) - Update does not conform to the configured schema (203) =#=#=#=
* Passed: cibadmin - Try to make resulting CIB invalid (unrecognized validate-with)
=#=#=#= Begin test: Run crm_simulate with invalid CIB (unrecognized validate-with) =#=#=#=
-( schemas.c:736 ) debug: update_validation: Unknown validation type
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-0.6' validation (0 of X)
+( schemas.c:NNN ) debug: update_validation: Unknown validation type
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-0.6' validation (0 of X)
element rsc_order: validity error : Element rsc_order does not carry attribute to
element rsc_order: validity error : Element rsc_order does not carry attribute from
element rsc_order: validity error : No declaration for attribute first of element rsc_order
element rsc_order: validity error : No declaration for attribute first-action of element rsc_order
element rsc_order: validity error : No declaration for attribute then of element rsc_order
-( schemas.c:760 ) trace: update_validation: pacemaker-0.6 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'transitional-0.6' validation (1 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-0.6 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'transitional-0.6' validation (1 of X)
element rsc_order: validity error : Element rsc_order does not carry attribute to
element rsc_order: validity error : Element rsc_order does not carry attribute from
element rsc_order: validity error : No declaration for attribute first of element rsc_order
element rsc_order: validity error : No declaration for attribute first-action of element rsc_order
element rsc_order: validity error : No declaration for attribute then of element rsc_order
-( schemas.c:760 ) trace: update_validation: transitional-0.6 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-0.7' validation (2 of X)
+( schemas.c:NNN ) trace: update_validation: transitional-0.6 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-0.7' validation (2 of X)
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
-( schemas.c:760 ) trace: update_validation: pacemaker-0.7 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-1.0' validation (3 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-0.7 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-1.0' validation (3 of X)
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
-( schemas.c:760 ) trace: update_validation: pacemaker-1.0 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-1.2' validation (4 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-1.0 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-1.2' validation (4 of X)
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
-( schemas.c:760 ) trace: update_validation: pacemaker-1.2 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-1.3' validation (5 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-1.2 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-1.3' validation (5 of X)
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
-( schemas.c:760 ) trace: update_validation: pacemaker-1.3 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.0' validation (6 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-1.3 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.0' validation (6 of X)
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
-( schemas.c:760 ) trace: update_validation: pacemaker-2.0 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.1' validation (7 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.0 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.1' validation (7 of X)
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
-( schemas.c:760 ) trace: update_validation: pacemaker-2.1 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.2' validation (8 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.1 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.2' validation (8 of X)
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
-( schemas.c:760 ) trace: update_validation: pacemaker-2.2 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.3' validation (9 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.2 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.3' validation (9 of X)
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
-( schemas.c:760 ) trace: update_validation: pacemaker-2.3 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.4' validation (10 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.3 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.4' validation (10 of X)
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
-( schemas.c:760 ) trace: update_validation: pacemaker-2.4 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.5' validation (11 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.4 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.5' validation (11 of X)
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
-( schemas.c:760 ) trace: update_validation: pacemaker-2.5 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.6' validation (12 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.5 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.6' validation (12 of X)
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
-( schemas.c:760 ) trace: update_validation: pacemaker-2.6 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.7' validation (13 of X)
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.6 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.7' validation (13 of X)
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
-( schemas.c:760 ) trace: update_validation: pacemaker-2.7 validation failed
+( schemas.c:NNN ) trace: update_validation: pacemaker-2.7 validation failed
Your current configuration pacemaker-9999.0 could not validate with any schema in range [unknown, pacemaker-2.7], cannot upgrade to pacemaker-2.0.
=#=#=#= End test: Run crm_simulate with invalid CIB (unrecognized validate-with) - Required key not available (126) =#=#=#=
* Passed: crm_simulate - Run crm_simulate with invalid CIB (unrecognized validate-with)
@@ -159,36 +159,36 @@ Call failed: Update does not conform to the configured schema
=#=#=#= End test: Try to make resulting CIB invalid, but possibly recoverable (valid with X.Y+1) - Update does not conform to the configured schema (203) =#=#=#=
* Passed: cibadmin - Try to make resulting CIB invalid, but possibly recoverable (valid with X.Y+1)
=#=#=#= Begin test: Run crm_simulate with invalid, but possibly recoverable CIB (valid with X.Y+1) =#=#=#=
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-1.2' validation (4 of X)
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-1.2' validation (4 of X)
element tags: Relax-NG validity error : Element configuration has extra content: tags
-( schemas.c:760 ) trace: update_validation: pacemaker-1.2 validation failed
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-1.3' validation (5 of X)
-( schemas.c:804 ) debug: update_validation: Upgrading pacemaker-1.3-style configuration to pacemaker-2.0 with upgrade-1.3.xsl
-( schemas.c:816 ) info: update_validation: Transformation upgrade-1.3.xsl successful
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.0' validation (6 of X)
-( schemas.c:797 ) debug: update_validation: pacemaker-2.0-style configuration is also valid for pacemaker-2.1
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.1' validation (7 of X)
-( schemas.c:771 ) debug: update_validation: Configuration valid for schema: pacemaker-2.1
-( schemas.c:797 ) debug: update_validation: pacemaker-2.1-style configuration is also valid for pacemaker-2.2
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.2' validation (8 of X)
-( schemas.c:771 ) debug: update_validation: Configuration valid for schema: pacemaker-2.2
-( schemas.c:797 ) debug: update_validation: pacemaker-2.2-style configuration is also valid for pacemaker-2.3
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.3' validation (9 of X)
-( schemas.c:771 ) debug: update_validation: Configuration valid for schema: pacemaker-2.3
-( schemas.c:797 ) debug: update_validation: pacemaker-2.3-style configuration is also valid for pacemaker-2.4
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.4' validation (10 of X)
-( schemas.c:771 ) debug: update_validation: Configuration valid for schema: pacemaker-2.4
-( schemas.c:797 ) debug: update_validation: pacemaker-2.4-style configuration is also valid for pacemaker-2.5
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.5' validation (11 of X)
-( schemas.c:771 ) debug: update_validation: Configuration valid for schema: pacemaker-2.5
-( schemas.c:797 ) debug: update_validation: pacemaker-2.5-style configuration is also valid for pacemaker-2.6
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.6' validation (12 of X)
-( schemas.c:771 ) debug: update_validation: Configuration valid for schema: pacemaker-2.6
-( schemas.c:797 ) debug: update_validation: pacemaker-2.6-style configuration is also valid for pacemaker-2.7
-( schemas.c:751 ) debug: update_validation: Testing 'pacemaker-2.7' validation (13 of X)
-( schemas.c:771 ) debug: update_validation: Configuration valid for schema: pacemaker-2.7
-( schemas.c:787 ) trace: update_validation: Stopping at pacemaker-2.7
-( schemas.c:843 ) info: update_validation: Transformed the configuration from pacemaker-1.2 to pacemaker-2.7
+( schemas.c:NNN ) trace: update_validation: pacemaker-1.2 validation failed
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-1.3' validation (5 of X)
+( schemas.c:NNN ) debug: update_validation: Upgrading pacemaker-1.3-style configuration to pacemaker-2.0 with upgrade-1.3.xsl
+( schemas.c:NNN ) info: update_validation: Transformation upgrade-1.3.xsl successful
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.0' validation (6 of X)
+( schemas.c:NNN ) debug: update_validation: pacemaker-2.0-style configuration is also valid for pacemaker-2.1
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.1' validation (7 of X)
+( schemas.c:NNN ) debug: update_validation: Configuration valid for schema: pacemaker-2.1
+( schemas.c:NNN ) debug: update_validation: pacemaker-2.1-style configuration is also valid for pacemaker-2.2
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.2' validation (8 of X)
+( schemas.c:NNN ) debug: update_validation: Configuration valid for schema: pacemaker-2.2
+( schemas.c:NNN ) debug: update_validation: pacemaker-2.2-style configuration is also valid for pacemaker-2.3
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.3' validation (9 of X)
+( schemas.c:NNN ) debug: update_validation: Configuration valid for schema: pacemaker-2.3
+( schemas.c:NNN ) debug: update_validation: pacemaker-2.3-style configuration is also valid for pacemaker-2.4
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.4' validation (10 of X)
+( schemas.c:NNN ) debug: update_validation: Configuration valid for schema: pacemaker-2.4
+( schemas.c:NNN ) debug: update_validation: pacemaker-2.4-style configuration is also valid for pacemaker-2.5
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.5' validation (11 of X)
+( schemas.c:NNN ) debug: update_validation: Configuration valid for schema: pacemaker-2.5
+( schemas.c:NNN ) debug: update_validation: pacemaker-2.5-style configuration is also valid for pacemaker-2.6
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.6' validation (12 of X)
+( schemas.c:NNN ) debug: update_validation: Configuration valid for schema: pacemaker-2.6
+( schemas.c:NNN ) debug: update_validation: pacemaker-2.6-style configuration is also valid for pacemaker-2.7
+( schemas.c:NNN ) debug: update_validation: Testing 'pacemaker-2.7' validation (13 of X)
+( schemas.c:NNN ) debug: update_validation: Configuration valid for schema: pacemaker-2.7
+( schemas.c:NNN ) trace: update_validation: Stopping at pacemaker-2.7
+( schemas.c:NNN ) info: update_validation: Transformed the configuration from pacemaker-1.2 to pacemaker-2.7
error: unpack_resources: Resource start-up disabled since no STONITH resources have been defined
error: unpack_resources: Either configure some or disable STONITH with the stonith-enabled option
error: unpack_resources: NOTE: Clusters with shared data need STONITH to ensure data integrity
--
1.8.3.1
From eacd1a651d5c081aa297d09e07a1bc0b3d00fe04 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Thu, 19 Jan 2017 17:56:47 -0600
Subject: [PATCH 2/2] Test: tools: make regression test clean up after itself
on success
---
tools/regression.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/regression.sh b/tools/regression.sh
index edc5e6b..56de6a4 100755
--- a/tools/regression.sh
+++ b/tools/regression.sh
@@ -606,7 +606,7 @@ function test_acls() {
$VALGRIND_CMD crm_shadow --batch --force --create-empty $shadow --validate-with pacemaker-1.3 2>&1
export CIB_shadow=$shadow
- cat<<EOF>/tmp/$$.acls.xml
+ cat <<EOF >/tmp/$$.acls.xml
<acls>
<acl_user id="l33t-haxor">
<deny id="crook-nothing" xpath="/cib"/>
@@ -794,5 +794,9 @@ elif [ $failed = 1 ]; then
exit 2
else
echo $num_passed tests passed
+ for t in $tests; do
+ rm -f "$test_home/regression.$t.out"
+ done
+ crm_shadow --force --delete $shadow >/dev/null 2>&1
exit 0
fi
--
1.8.3.1