]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/rbd: fix list-mapped filter in unmap_device 35046/head
authorMykola Golub <mgolub@suse.com>
Tue, 28 Apr 2020 10:45:33 +0000 (11:45 +0100)
committerNathan Cutler <ncutler@suse.com>
Wed, 13 May 2020 15:39:36 +0000 (17:39 +0200)
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 <mgolub@suse.com>
(cherry picked from commit d667e385a12ea4125dbf74da97a9ba4911a3f7bc)

qa/workunits/rbd/rbd-nbd.sh

index f44da74181b1806f59739d850ded599823f4bec4..e21eede07754cffb0289bec46b0fc7a6ebf46e73 100755 (executable)
@@ -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
 }