qa/workunits/mon/pool_ops.sh: use expect_false

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 2436cc4837e71ab8acd3f8efa55d1faf89c6ea4e..f6f364f9aa5fc503c1b93bfc0497e17eba4a49a2 100755 (executable)
--- a/qa/workunits/mon/pool_ops.sh
+++ b/qa/workunits/mon/pool_ops.sh
@@ -1,8 +1,14 @@
-#!/bin/sh -x
+#!/bin/bash -x
 
 set -e
 
-ceph osd pool create foo 123 123 key1=+++              && exit 1 || true
+function expect_false()
+{
+       set -x
+       if "$@"; then return 1; else return 0; fi
+}
+
+expect_false ceph osd pool create foo 123 123 key1=+++
 ceph osd pool create foo 123 123 key1=value1 key2 key3=value3
 ceph osd pool create fooo 123
 
@@ -11,15 +17,15 @@ ceph osd pool create foo 123 # idempotent
 ceph osd pool set foo size 1
 ceph osd pool set foo size 4
 ceph osd pool set foo size 10
-ceph osd pool set foo size 0                           && exit 1 || true
-ceph osd pool set foo size 20                          && exit 1 || true
+expect_false ceph osd pool set foo size 0
+expect_false ceph osd pool set foo size 20
 
 # should fail due to safety interlock
-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
+expect_false ceph osd pool delete foo
+expect_false ceph osd pool delete foo foo
+expect_false ceph osd pool delete foo foo --force
+expect_false ceph osd pool delete foo fooo --yes-i-really-mean-it
+expect_false ceph osd pool delete foo --yes-i-really-mean-it 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