From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 23 Jul 2018 18:58:51 +0000 (-0400)
Subject: qa/workunits/rbd: updates to the clone v2 CLI tests
X-Git-Tag: v13.2.2~55^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ed57edb305264a5495696cc414d24781e559c05;p=ceph.git

qa/workunits/rbd: updates to the clone v2 CLI tests

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 1e45d405da522057558182b4a374daba0a4a0a13)
---

diff --git a/qa/workunits/rbd/cli_generic.sh b/qa/workunits/rbd/cli_generic.sh
index b1c54db4e58..4f5da00416a 100755
--- a/qa/workunits/rbd/cli_generic.sh
+++ b/qa/workunits/rbd/cli_generic.sh
@@ -543,7 +543,7 @@ test_clone_v2() {
     rbd snap unprotect test1@1
 
     rbd snap remove test1@1
-    rbd snap list --all test1 | grep -E "trash[ ]*$"
+    rbd snap list --all test1 | grep -E "trash \(1\) *$"
 
     rbd snap create test1@2
     rbd rm test1 2>&1 | grep 'image has snapshots'
@@ -555,6 +555,7 @@ test_clone_v2() {
     rbd rm test1 2>&1 | grep 'linked clones'
 
     rbd flatten test2
+    rbd snap list --all test1 | wc -l | grep '^0$'
     rbd rm test1
     rbd rm test2
 }