Skip to content

Commit

Permalink
test: accept GC'ed units in newer LVM
Browse files Browse the repository at this point in the history
Since lvm 2.03.15 the transient units are started without `-r`, thus
disappearing once they finish and breaking the test (which expects them
to remain loaded after finishing). Let's accept `LoadState=not-found` as
a valid result as well to fix this.

Follow-up to: d10d562
See: https://sourceware.org/git/?p=lvm2.git;a=commit;h=fbd8b0cf43dc67f51f86f060dce748f446985855
  • Loading branch information
mrc0mmand committed Feb 10, 2022
1 parent 2d88df4 commit b034f02
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions test/units/testsuite-64.sh
Expand Up @@ -96,6 +96,14 @@ helper_wait_for_lvm_activate() {
if [[ "$(systemctl show -P SubState "$lvm_activate_svc")" == exited ]]; then
return 0
fi
else
# Since lvm 2.03.15 the lvm-activate transient unit no longer remains
# after finishing, so we have to treat non-existent units as a success
# as well
# See: https://sourceware.org/git/?p=lvm2.git;a=commit;h=fbd8b0cf43dc67f51f86f060dce748f446985855
if [[ "$(systemctl show -P LoadState "$lvm_activate_svc")" == not-found ]]; then
return 0
fi
fi

sleep .5
Expand Down

0 comments on commit b034f02

Please sign in to comment.