From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 15 Jun 2016 13:05:05 +0000 (-0400)
Subject: qa/workunits: rados cppool now requires --yes-i-really-really-mean-it
X-Git-Tag: v11.0.0~153^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=321824d3f7d2714a0676be766e90a8f4233ed3c9;p=ceph.git

qa/workunits: rados cppool now requires --yes-i-really-really-mean-it

Fixes: http://tracker.ceph.com/issues/16202
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/qa/workunits/mon/rbd_snaps_ops.sh b/qa/workunits/mon/rbd_snaps_ops.sh
index 97c99966c528..a11172d1014f 100755
--- a/qa/workunits/mon/rbd_snaps_ops.sh
+++ b/qa/workunits/mon/rbd_snaps_ops.sh
@@ -18,11 +18,12 @@ expect()
   fi
 }
 
+ceph osd pool delete test test --yes-i-really-really-mean-it || true
 expect 'ceph osd pool create test 256 256' 0
 expect 'ceph osd pool mksnap test snapshot' 0
 expect 'ceph osd pool rmsnap test snapshot' 0
 
-expect 'rbd --pool=test create --size=102400 image' 0
+expect 'rbd --pool=test --rbd_validate_pool=false create --size=102400 image' 0
 expect 'rbd --pool=test snap create image@snapshot' 22
 
 expect 'ceph osd pool delete test test --yes-i-really-really-mean-it' 0
@@ -40,11 +41,14 @@ expect 'ceph osd pool delete test test --yes-i-really-really-mean-it' 0
 # basically create such a scenario where we end up deleting what used to
 # be an unmanaged snapshot from a not-unmanaged pool
 
+ceph osd pool delete test-foo test-foo --yes-i-really-really-mean-it || true
 expect 'rados mkpool test-foo' 0
 expect 'rbd --pool test-foo create --size 1024 image' 0
 expect 'rbd --pool test-foo snap create image@snapshot' 0
+
+ceph osd pool delete test-bar test-bar --yes-i-really-really-mean-it || true
 expect 'rados mkpool test-bar' 0
-expect 'rados cppool test-foo test-bar' 0
+expect 'rados cppool test-foo test-bar --yes-i-really-mean-it' 0
 expect 'rbd --pool test-bar snap rm image@snapshot' 95
 expect 'ceph osd pool delete test-foo test-foo --yes-i-really-really-mean-it' 0
 expect 'ceph osd pool delete test-bar test-bar --yes-i-really-really-mean-it' 0