]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: fix mon pool_ops workunit
authorJosh Durgin <josh.durgin@inktank.com>
Mon, 28 Jan 2013 22:20:42 +0000 (14:20 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Mon, 28 Jan 2013 23:25:13 +0000 (15:25 -0800)
Use ! for clarity when commands are supposed to fail.
Check a few other cases that should fail, and correct deleting
non-existent pools.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
qa/workunits/mon/pool_ops.sh

index a9e9f422c409c5366852d1a20ae3eb9df9789d67..2d346cc137fed81345078407f7e5d9a29c6e331c 100755 (executable)
@@ -7,15 +7,25 @@ ceph osd pool create fooo 123
 
 ceph osd pool create foo 123 # idempotent
 
-ceph osd pool delete foo && exit 1 || true    # should fail due to safety interlock
-ceph osd pool delete foo foo && exit 1 || true    # should fail due to safety interlock
-ceph osd pool delete foo foo --force && exit 1 || true    # should fail due to safety interlock
+# should fail due to safety interlock
+! ceph osd pool delete foo
+! ceph osd pool delete foo foo
+! ceph osd pool delete foo foo --force
+! ceph osd pool delete foo fooo --yes-i-really-mean-it
+! ceph osd pool delete foo --yes-i-really-mean-it foo
+! ceph osd pool delete --yes-i-really-mean-it foo foo
 
+
+ceph osd pool delete fooo fooo --yes-i-really-really-mean-it
 ceph osd pool delete foo foo --yes-i-really-really-mean-it
+
+# idempotent
 ceph osd pool delete foo foo --yes-i-really-really-mean-it
-ceph osd pool delete fuggg fugg --yes-i-really-really-mean-it
+ceph osd pool delete fooo fooo --yes-i-really-really-mean-it
+ceph osd pool delete fooo fooo --yes-i-really-really-mean-it
 
-ceph osd pool delete fooo
+# non-existent pool
+! ceph osd pool delete fuggg fuggg --yes-i-really-really-mean-it
 
 echo OK