From: Ilya Dryomov Date: Sat, 19 Mar 2022 13:04:52 +0000 (+0100) Subject: qa/workunits/rbd/cli_generic.sh: relax trash purge schedule status assert X-Git-Tag: v16.2.8~79^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c5a4a4bc0ec81205c577f5b06a12b60c66972752;p=ceph.git qa/workunits/rbd/cli_generic.sh: relax trash purge schedule status assert Commit 08df6e0fd006 ("qa/workunits/rbd: expand LevelSpec parsing coverage") didn't account for images with a separate data pool. This was missed because of small-cache-pool.yaml breakage. Signed-off-by: Ilya Dryomov (cherry picked from commit 90a90ad47dd3140c796ef4da7263c9633d34e841) --- diff --git a/qa/workunits/rbd/cli_generic.sh b/qa/workunits/rbd/cli_generic.sh index 220cef87b253..32c45790fa60 100755 --- a/qa/workunits/rbd/cli_generic.sh +++ b/qa/workunits/rbd/cli_generic.sh @@ -1179,8 +1179,8 @@ test_trash_purge_schedule() { rbd trash purge schedule status rbd trash purge schedule status --format xml | $XMLSTARLET sel -t -v '//scheduled/item/pool' | grep 'rbd2' - test "$(echo $(rbd trash purge schedule status --format xml | - $XMLSTARLET sel -t -v '//scheduled/item/pool'))" = 'rbd rbd2 rbd2' + echo $(rbd trash purge schedule status --format xml | + $XMLSTARLET sel -t -v '//scheduled/item/pool') | grep 'rbd rbd2 rbd2' test "$(rbd trash purge schedule status -p rbd --format xml | $XMLSTARLET sel -t -v '//scheduled/item/pool')" = 'rbd' test "$(echo $(rbd trash purge schedule status -p rbd2 --format xml |