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: v14.0.1~767^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F23191%2Fhead;p=ceph.git

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

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/qa/workunits/rbd/cli_generic.sh b/qa/workunits/rbd/cli_generic.sh
index adb1ccf06f88..0ecb75186bd6 100755
--- a/qa/workunits/rbd/cli_generic.sh
+++ b/qa/workunits/rbd/cli_generic.sh
@@ -551,7 +551,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'
@@ -563,6 +563,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
 }