From 40f0cfcd506a458b4bd53d547f1c7a9ebfcfed39 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Tue, 28 Apr 2020 11:45:33 +0100 Subject: [PATCH] qa/workunits/rbd: fix list-mapped filter in unmap_device In recent versions `rbd list-mapped` does not print the white space at the end of the line. Fixes: https://tracker.ceph.com/issues/45305 Signed-off-by: Mykola Golub (cherry picked from commit d667e385a12ea4125dbf74da97a9ba4911a3f7bc) --- qa/workunits/rbd/rbd-nbd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/workunits/rbd/rbd-nbd.sh b/qa/workunits/rbd/rbd-nbd.sh index f44da74181b18..e21eede07754c 100755 --- a/qa/workunits/rbd/rbd-nbd.sh +++ b/qa/workunits/rbd/rbd-nbd.sh @@ -109,7 +109,7 @@ unmap_device() for s in 0.5 1 2 4 8 16 32; do sleep ${s} - rbd-nbd list-mapped | expect_false grep "${list_dev} $" && return 0 + rbd-nbd list-mapped | expect_false grep "${list_dev} *$" && return 0 done return 1 } -- 2.39.5