From 90a90ad47dd3140c796ef4da7263c9633d34e841 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Sat, 19 Mar 2022 14:04:52 +0100 Subject: [PATCH] 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 --- qa/workunits/rbd/cli_generic.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/workunits/rbd/cli_generic.sh b/qa/workunits/rbd/cli_generic.sh index 974e3234cdbc..6b403c09567d 100755 --- a/qa/workunits/rbd/cli_generic.sh +++ b/qa/workunits/rbd/cli_generic.sh @@ -1182,8 +1182,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 | -- 2.47.3