From: Mykola Golub <mgolub@suse.com>
Date: Thu, 11 Jun 2020 16:16:50 +0000 (+0100)
Subject: test/cli-integration/rbd: tweak after snap create started to show progress
X-Git-Tag: v16.1.0~2015^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5a5fea9e2b4250976c8a72bd0529177e4ba098a;p=ceph.git

test/cli-integration/rbd: tweak after snap create started to show progress

Signed-off-by: Mykola Golub <mgolub@suse.com>
---

diff --git a/src/test/cli-integration/rbd/formatted-output.t b/src/test/cli-integration/rbd/formatted-output.t
index e063c0d7bbc5..778cc2198fce 100644
--- a/src/test/cli-integration/rbd/formatted-output.t
+++ b/src/test/cli-integration/rbd/formatted-output.t
@@ -22,21 +22,21 @@ create
 
 snapshot
 ========
-  $ rbd snap create bar@snap
+  $ rbd snap create bar@snap --no-progress
   $ rbd resize -s 1024 --no-progress bar
   $ rbd resize -s 2G --no-progress quuy
-  $ rbd snap create bar@snap2
-  $ rbd snap create foo@snap
+  $ rbd snap create bar@snap2 --no-progress
+  $ rbd snap create foo@snap --no-progress
 
 clone
 =====
   $ rbd snap protect bar@snap
   $ rbd clone --image-feature layering,exclusive-lock,object-map,fast-diff bar@snap rbd_other/child
-  $ rbd snap create rbd_other/child@snap
+  $ rbd snap create rbd_other/child@snap --no-progress
   $ rbd flatten rbd_other/child 2> /dev/null
   $ rbd bench rbd_other/child --io-type write --io-pattern seq --io-total 1B > /dev/null 2>&1
   $ rbd clone bar@snap rbd_other/deep-flatten-child
-  $ rbd snap create rbd_other/deep-flatten-child@snap
+  $ rbd snap create rbd_other/deep-flatten-child@snap --no-progress
   $ rbd flatten rbd_other/deep-flatten-child 2> /dev/null
 
 lock
diff --git a/src/test/cli-integration/rbd/snap-diff.t b/src/test/cli-integration/rbd/snap-diff.t
index ba9c0d6fed61..1ca2fb04ddd9 100644
--- a/src/test/cli-integration/rbd/snap-diff.t
+++ b/src/test/cli-integration/rbd/snap-diff.t
@@ -8,7 +8,7 @@
   $ rbd create --size 1M xrbddiff1/xtestdiff1
   $ rbd diff xrbddiff1/xtestdiff1 --format json
   []
-  $ rbd snap create xrbddiff1/xtestdiff1 --snap=allzeroes
+  $ rbd snap create xrbddiff1/xtestdiff1 --snap=allzeroes --no-progress
   $ rbd diff xrbddiff1/xtestdiff1 --format json
   []
   $ rbd diff --from-snap=allzeroes xrbddiff1/xtestdiff1 --format json
@@ -18,7 +18,7 @@
   [{"offset":0,"length":1048576,"exists":"true"}]
   $ rbd diff --from-snap=allzeroes xrbddiff1/xtestdiff1 --format json
   [{"offset":0,"length":1048576,"exists":"true"}]
-  $ rbd snap create xrbddiff1/xtestdiff1 --snap=snap1
+  $ rbd snap create xrbddiff1/xtestdiff1 --snap=snap1 --no-progress
   $ rbd snap list xrbddiff1/xtestdiff1 --format json | python3 -mjson.tool --sort-keys | sed 's/,$/, /'
   [
       {
diff --git a/src/test/cli-integration/rbd/unmap.t b/src/test/cli-integration/rbd/unmap.t
index aa381b1bc203..06b8ee666c1c 100644
--- a/src/test/cli-integration/rbd/unmap.t
+++ b/src/test/cli-integration/rbd/unmap.t
@@ -3,13 +3,13 @@ Setup
 =====
 
   $ rbd create --size 1 img
-  $ rbd snap create img@snap
+  $ rbd snap create img@snap --no-progress
   $ rbd create --size 1 anotherimg
   $ ceph osd pool create custom >/dev/null 2>&1
   $ rbd pool init custom
   $ rbd create --size 1 custom/img
-  $ rbd snap create custom/img@snap
-  $ rbd snap create custom/img@anothersnap
+  $ rbd snap create custom/img@snap --no-progress
+  $ rbd snap create custom/img@anothersnap --no-progress
 
 Spell out device instead of using $DEV - sfdisk is not a joke.