Skip to content

Commit 14d5eb9

Browse files
committed
Test: extra: Dummy stop shouldn't fail if monitor is in progress
1 parent 9fe4719 commit 14d5eb9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

extra/resources/Dummy

+2-2
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ dummy_start() {
172172
}
173173

174174
dummy_stop() {
175-
dummy_monitor
175+
dummy_monitor --force
176176
if [ $? -eq $OCF_SUCCESS ]; then
177177
rm ${OCF_RESKEY_state}
178178
fi
@@ -186,7 +186,7 @@ dummy_monitor() {
186186
# That is THREE states, not just yes/no.
187187

188188
if [ $OCF_RESKEY_op_sleep -ne 0 ]; then
189-
if [ -f "${VERIFY_SERIALIZED_FILE}" ]; then
189+
if [ "$1" = "" -a -f "${VERIFY_SERIALIZED_FILE}" ]; then
190190
# two monitor ops have occurred at the same time.
191191
# this is to verify a condition in the lrmd regression tests.
192192
ocf_log err "$VERIFY_SERIALIZED_FILE exists already"

0 commit comments

Comments
 (0)