packages/pcs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
pcs/0001-Resolve-the-failure-of-field-matching-in-test-cases.patch
jxy_git c7695ed670 update to 0.10.8 
(cherry picked from commit 7baf79e0e60b374ced73326b0dd8898a2219bc0b)
2022-03-10 17:59:00 +08:00

185 lines
9.1 KiB
Diff
Raw Blame History

From ff5b952ef785af34429b2560bb11d4ec7c7e07fa Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Thu, 10 Mar 2022 16:45:14 +0800
Subject: [PATCH] Resolve-the-failure-of-field-matching-in-test-cases
---
pcs_test/tier0/lib/cib/rule/test_parser.py | 64 +++++++++----------
pcs_test/tier0/lib/cib/test_nvpair_multi.py | 2 +-
.../tier0/lib/commands/test_cib_options.py | 2 +-
3 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/pcs_test/tier0/lib/cib/rule/test_parser.py b/pcs_test/tier0/lib/cib/rule/test_parser.py
index ccedfee..e9b567f 100644
--- a/pcs_test/tier0/lib/cib/rule/test_parser.py
+++ b/pcs_test/tier0/lib/cib/rule/test_parser.py
@@ -782,8 +782,8 @@ class Parser(TestCase):
def test_not_valid_rule(self):
test_data = [
# node attr misc
- ("#uname", (1, 7, 6, 'Expected "eq"')),
- ("string node1", (1, 8, 7, 'Expected "eq"')),
+ ("#uname", (1, 7, 6, "Expected CaselessKeyword 'eq'")),
+ ("string node1", (1, 8, 7, "Expected CaselessKeyword 'eq'")),
# node attr unary
("defined", (1, 8, 7, "Expected <attribute name>")),
("not_defined", (1, 12, 11, "Expected <attribute name>")),
@@ -791,58 +791,58 @@ class Parser(TestCase):
("defined date-spec hours=1", (1, 19, 18, "Expected end of text")),
("defined duration hours=1", (1, 18, 17, "Expected end of text")),
# node attr binary
- ("eq", (1, 3, 2, 'Expected "eq"')),
+ ("eq", (1, 3, 2, "Expected CaselessKeyword 'eq'")),
("#uname eq", (1, 10, 9, "Expected <attribute value>")),
- ("#uname node1", (1, 8, 7, 'Expected "eq"')),
- ("eq #uname", (1, 4, 3, 'Expected "eq"')),
+ ("#uname node1", (1, 8, 7, "Expected CaselessKeyword 'eq'")),
+ ("eq #uname", (1, 4, 3, "Expected CaselessKeyword 'eq'")),
("eq lt", (1, 6, 5, "Expected <attribute value>")),
- ("string #uname eq node1", (1, 8, 7, 'Expected "eq"')),
+ ("string #uname eq node1", (1, 8, 7, "Expected CaselessKeyword 'eq'")),
("date-spec hours=1 eq node1", (1, 19, 18, "Expected end of text")),
(
"#uname eq date-spec hours=1",
(1, 21, 20, "Expected end of text"),
),
- ("duration hours=1 eq node1", (1, 10, 9, 'Expected "eq"')),
+ ("duration hours=1 eq node1", (1, 10, 9, "Expected CaselessKeyword 'eq'")),
("#uname eq duration hours=1", (1, 20, 19, "Expected end of text")),
# node attr binary with optional parts
- ("string", (1, 7, 6, 'Expected "eq"')),
+ ("string", (1, 7, 6, "Expected CaselessKeyword 'eq'")),
("#uname eq string", (1, 17, 16, "Expected <attribute value>")),
- ("string #uname eq node1", (1, 8, 7, 'Expected "eq"')),
+ ("string #uname eq node1", (1, 8, 7, "Expected CaselessKeyword 'eq'")),
# resource, op
- ("resource", (1, 9, 8, 'Expected "eq"')),
- ("op", (1, 3, 2, 'Expected "eq"')),
+ ("resource", (1, 9, 8, "Expected CaselessKeyword 'eq'")),
+ ("op", (1, 3, 2, "Expected CaselessKeyword 'eq'")),
("resource ::rA and", (1, 15, 14, "Expected end of text")),
("resource ::rA and op ", (1, 15, 14, "Expected end of text")),
("resource ::rA and (", (1, 15, 14, "Expected end of text")),
# and, or
- ("and", (1, 4, 3, 'Expected "eq"')),
- ("or", (1, 3, 2, 'Expected "eq"')),
- ("#uname and node1", (1, 8, 7, 'Expected "eq"')),
- ("#uname or node1", (1, 8, 7, 'Expected "eq"')),
- ("#uname or eq", (1, 8, 7, 'Expected "eq"')),
+ ("and", (1, 4, 3, "Expected CaselessKeyword 'eq'")),
+ ("or", (1, 3, 2, "Expected CaselessKeyword 'eq'")),
+ ("#uname and node1", (1, 8, 7, "Expected CaselessKeyword 'eq'")),
+ ("#uname or node1", (1, 8, 7, "Expected CaselessKeyword 'eq'")),
+ ("#uname or eq", (1, 8, 7, "Expected CaselessKeyword 'eq'")),
("#uname eq node1 and node2", (1, 17, 16, "Expected end of text")),
("#uname eq node1 and", (1, 17, 16, "Expected end of text")),
(
"#uname eq node1 and #uname eq",
(1, 17, 16, "Expected end of text"),
),
- ("and #uname eq node1", (1, 5, 4, 'Expected "eq"')),
+ ("and #uname eq node1", (1, 5, 4, "Expected CaselessKeyword 'eq'")),
(
"#uname ne node1 and duration hours=1",
(1, 17, 16, "Expected end of text"),
),
(
"duration monthdays=1 or #uname ne node1",
- (1, 10, 9, 'Expected "eq"'),
+ (1, 10, 9, "Expected CaselessKeyword 'eq'"),
),
# date
- ("date in_range", (1, 14, 13, 'Expected "to"')),
- ("date in_range 2014-06-26", (1, 15, 14, 'Expected "to"')),
+ ("date in_range", (1, 14, 13, "Expected CaselessKeyword 'to'")),
+ ("date in_range 2014-06-26", (1, 15, 14, "Expected CaselessKeyword 'to'")),
("date in_range 2014-06-26 to", (1, 28, 27, "Expected <date>")),
- ("in_range 2014-06-26 to 2014-07-26", (1, 10, 9, 'Expected "eq"')),
+ ("in_range 2014-06-26 to 2014-07-26", (1, 10, 9, "Expected CaselessKeyword 'eq'")),
(
"date in_range #uname eq node1 to 2014-07-26",
- (1, 15, 14, 'Expected "to"'),
+ (1, 15, 14, "Expected CaselessKeyword 'to'"),
),
(
"date in_range 2014-06-26 to #uname eq node1",
@@ -850,7 +850,7 @@ class Parser(TestCase):
),
(
"date in_range defined pingd to 2014-07-26",
- (1, 15, 14, 'Expected "to"'),
+ (1, 15, 14, "Expected CaselessKeyword 'to'"),
),
(
"date in_range 2014-06-26 to defined pingd",
@@ -858,11 +858,11 @@ class Parser(TestCase):
),
(
"string date in_range 2014-06-26 to 2014-07-26",
- (1, 8, 7, 'Expected "eq"'),
+ (1, 8, 7, "Expected CaselessKeyword 'eq'"),
),
(
"date in_range string 2014-06-26 to 2014-07-26",
- (1, 15, 14, 'Expected "to"'),
+ (1, 15, 14, "Expected CaselessKeyword 'to'"),
),
(
"date in_range 2014-06-26 to string 2014-07-26",
@@ -870,19 +870,19 @@ class Parser(TestCase):
),
(
"date in_range 2014-06-26 string to 2014-07-26",
- (1, 15, 14, 'Expected "to"'),
+ (1, 15, 14, "Expected CaselessKeyword 'to'"),
),
(
"#uname in_range 2014-06-26 to 2014-07-26",
- (1, 8, 7, 'Expected "eq"'),
+ (1, 8, 7, "Expected CaselessKeyword 'eq'"),
),
# braces
- ("(#uname)", (1, 8, 7, 'Expected "eq"')),
- ("(", (1, 2, 1, 'Expected "date"')),
- ("()", (1, 2, 1, 'Expected "date"')),
- ("(#uname", (1, 8, 7, 'Expected "eq"')),
+ ("(#uname)", (1, 8, 7, "Expected CaselessKeyword 'eq'")),
+ ("(", (1, 2, 1, "Expected CaselessKeyword 'date'")),
+ ("()", (1, 2, 1, "Expected CaselessKeyword 'date'")),
+ ("(#uname", (1, 8, 7, "Expected CaselessKeyword 'eq'")),
("(#uname eq", (1, 11, 10, "Expected <attribute value>")),
- ("(#uname eq node1", (1, 17, 16, 'Expected ")"')),
+ ("(#uname eq node1", (1, 17, 16, "Expected ')'")),
]
for rule_string, exception_data in test_data:
with self.subTest(rule_string=rule_string):
diff --git a/pcs_test/tier0/lib/cib/test_nvpair_multi.py b/pcs_test/tier0/lib/cib/test_nvpair_multi.py
index ff5ed68..6d9cc76 100644
--- a/pcs_test/tier0/lib/cib/test_nvpair_multi.py
+++ b/pcs_test/tier0/lib/cib/test_nvpair_multi.py
@@ -531,7 +531,7 @@ class ValidateNvsetAppendNew(TestCase):
fixture.error(
reports.codes.RULE_EXPRESSION_PARSE_ERROR,
rule_string="bad rule",
- reason='Expected "eq"',
+ reason="Expected CaselessKeyword 'eq'",
rule_line="bad rule",
line_number=1,
column_number=5,
diff --git a/pcs_test/tier0/lib/commands/test_cib_options.py b/pcs_test/tier0/lib/commands/test_cib_options.py
index df2716c..84dc008 100644
--- a/pcs_test/tier0/lib/commands/test_cib_options.py
+++ b/pcs_test/tier0/lib/commands/test_cib_options.py
@@ -329,7 +329,7 @@ class DefaultsCreateMixin:
fixture.error(
reports.codes.RULE_EXPRESSION_PARSE_ERROR,
rule_string="bad rule",
- reason='Expected "eq"',
+ reason="Expected CaselessKeyword 'eq'",
rule_line="bad rule",
line_number=1,
column_number=5,
--
2.33.0
Reference in New Issue View Git Blame Copy Permalink