qa: mon/pool_ops.sh: fix pool tests

The '! command' doesn't fail properly, even with -e, in bash (wtf!).

Also, the last pool deletion command succeeds because the pool
'--yes-i-really-really-mean-it' doesn't exist.  So drop that test.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/qa/workunits/mon/pool_ops.sh b/qa/workunits/mon/pool_ops.sh
index 2d346cc137fed81345078407f7e5d9a29c6e331c..f5e91cce237d672ea0314cd6b91f4919b27247a2 100755 (executable)
--- a/qa/workunits/mon/pool_ops.sh
+++ b/qa/workunits/mon/pool_ops.sh
@@ -8,13 +8,11 @@ ceph osd pool create fooo 123
 ceph osd pool create foo 123 # idempotent
 
 # 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 foo                               && exit 1 || true
+ceph osd pool delete foo foo                           && exit 1 || true
+ceph osd pool delete foo foo --force                   && exit 1 || true
+ceph osd pool delete foo fooo --yes-i-really-mean-it   && exit 1 || true
+ceph osd pool delete foo --yes-i-really-mean-it foo    && exit 1 || true
 
 ceph osd pool delete fooo fooo --yes-i-really-really-mean-it
 ceph osd pool delete foo foo --yes-i-really-really-mean-it
@@ -25,7 +23,7 @@ ceph osd pool delete fooo fooo --yes-i-really-really-mean-it
 ceph osd pool delete fooo fooo --yes-i-really-really-mean-it
 
 # non-existent pool
-! ceph osd pool delete fuggg fuggg --yes-i-really-really-mean-it
+ceph osd pool delete fuggg fuggg --yes-i-really-really-mean-it     && exit 1 || true
 
 echo OK