Skip to content

Commit 37a4dc7

Browse files
liangxin1300liangxin1300
committed
Dev: testcases: Adjust original functional testcases for previous commit
1 parent 7343166 commit 37a4dc7

File tree

8 files changed

+102
-86
lines changed

8 files changed

+102
-86
lines changed

‎test/testcases/acl.exp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
.INP: _test
2424
.INP: verify
2525
.EXT crm_attribute --list-options=cluster --all --output-as=xml
26-
.EXT crmd metadata
27-
.EXT pengine metadata
28-
.EXT cib metadata
2926
.INP: show
3027
node node1
3128
primitive d0 ocf:pacemaker:Dummy \

‎test/testcases/bundle.exp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
.INP: _test
2020
.INP: verify
2121
.EXT crm_attribute --list-options=cluster --all --output-as=xml
22-
.EXT crmd metadata
23-
.EXT pengine metadata
24-
.EXT cib metadata
2522
.INP: show
2623
node node1 \
2724
attributes mem=16G

‎test/testcases/confbasic.exp‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,12 @@ INFO: 37: "collocation" is accepted as "colocation"
6868
.INP: set d2.mondelay 45
6969
.INP: _test
7070
.INP: verify
71+
warning: Support for <master> (such as in m) is deprecated and will be removed in a future release. Use <clone> with a promotable meta-attribute instead.
72+
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
73+
warning: Support for the Master role is deprecated and will be removed in a future release. Use Promoted instead.
74+
Warnings found during check: config not valid
7175
WARNING: 53: c2: resource d1 is grouped, constraints should apply to the group
7276
.EXT crm_attribute --list-options=cluster --all --output-as=xml
73-
.EXT crmd metadata
74-
.EXT pengine metadata
75-
.EXT cib metadata
7677
.INP: show
7778
node node1 \
7879
attributes mem=16G
@@ -187,6 +188,10 @@ op_defaults opsdef2: \
187188
rule 100: #uname eq node1 \
188189
record-pending=true
189190
.INP: commit
191+
warning: Support for <master> (such as in m) is deprecated and will be removed in a future release. Use <clone> with a promotable meta-attribute instead.
192+
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
193+
warning: Support for the Master role is deprecated and will be removed in a future release. Use Promoted instead.
194+
Warnings found during check: config not valid
190195
WARNING: 55: c2: resource d1 is grouped, constraints should apply to the group
191196
.TRY -F node maintenance node1
192197
.TRY -F resource maintenance g1 off
@@ -195,7 +200,8 @@ WARNING: 55: c2: resource d1 is grouped, constraints should apply to the group
195200
INFO: 'maintenance' attribute already exists in d1. Remove it? [YES]
196201
INFO: 'maintenance' attribute already exists in g1. Remove it? [YES]
197202
INFO: 'maintenance' attribute already exists in node1. Remove it? [YES]
203+
warning: Support for <master> (such as in m) is deprecated and will be removed in a future release. Use <clone> with a promotable meta-attribute instead.
204+
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
205+
warning: Support for the Master role is deprecated and will be removed in a future release. Use Promoted instead.
206+
Warnings found during check: config not valid
198207
.EXT crm_attribute --list-options=cluster --all --output-as=xml
199-
.EXT crmd metadata
200-
.EXT pengine metadata
201-
.EXT cib metadata

‎test/testcases/edit.exp‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,13 @@ rsc_defaults rsc_options: \
196196
op_defaults op-options: \
197197
timeout=60s
198198
.INP: commit
199+
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
200+
Warnings found during check: config not valid
199201
.EXT crm_attribute --list-options=cluster --all --output-as=xml
200-
.EXT crmd metadata
201-
.EXT pengine metadata
202-
.EXT cib metadata
203202
.INP: _test
204203
.INP: verify
204+
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
205+
Warnings found during check: config not valid
205206
.INP: primitive a0 ocf:heartbeat:Dummy
206207
.INP: primitive a1 ocf:heartbeat:Dummy
207208
.INP: primitive a2 ocf:heartbeat:Dummy
@@ -215,11 +216,15 @@ op_defaults op-options: \
215216
.INP: primitive aErr ocf:heartbeat:Dummy
216217
.INP: group as a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aErr
217218
.INP: commit
219+
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
220+
Warnings found during check: config not valid
218221
.INP: cd ..
219222
.INP: cd configure
220223
.INP: filter "sed '/as/s/a9//'"
221224
.INP: filter "sed '/as/s/a1/a1 a9/'"
222225
.INP: commit
226+
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
227+
Warnings found during check: config not valid
223228
.INP: cd ..
224229
.INP: cd configure
225230
.INP: filter "sed '/abs/s/a9//'"
@@ -331,6 +336,8 @@ INFO: 89: apparently there is nothing to commit
331336
INFO: 89: try changing something first
332337
.INP: _test
333338
.INP: verify
339+
warning: Support for multiple rule elements in a location constraint is deprecated and will be removed in a future release (use a single new rule combining the previous rules with boolean-op set to 'or' instead)
340+
Warnings found during check: config not valid
334341
.INP: show
335342
node node1 \
336343
attributes mem=16G

‎test/testcases/file.exp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ op_defaults op-options: \
4646
.INP: load update sample.txt
4747
ERROR: 4: syntax: Unknown command near <op> parsing 'op stop timeout=20s interval=0s'
4848
.EXT crm_attribute --list-options=cluster --all --output-as=xml
49-
.EXT crmd metadata
50-
.EXT pengine metadata
51-
.EXT cib metadata
5249
.TRY configure show
5350
node node1
5451
primitive p0 ocf:pacemaker:Dummy \

‎test/testcases/newfeatures.exp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,4 @@ alert notify_9 "/usr/share/pacemaker/alerts/alert_snmp.sh" \
7676
.INP: _test
7777
.INP: verify
7878
.EXT crm_attribute --list-options=cluster --all --output-as=xml
79-
.EXT crmd metadata
80-
.EXT pengine metadata
81-
.EXT cib metadata
8279
.INP: commit

0 commit comments

Comments
 (0)