summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Durgin <josh.durgin@inktank.com>2013-01-28 14:20:42 -0800
committerJosh Durgin <josh.durgin@inktank.com>2013-01-28 15:25:13 -0800
commit1a6197a75b9dbc8115028755cd928ff912c81100 (patch)
treeb20f716c71023bb4125873b2c087d224758c6b7d
parent1ba4c80bcf950d9c7a69afd75c6a5f918842877e (diff)
downloadceph-1a6197a75b9dbc8115028755cd928ff912c81100.tar.gz
qa: fix mon pool_ops workunit
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>
-rwxr-xr-xqa/workunits/mon/pool_ops.sh20
1 files changed, 15 insertions, 5 deletions
diff --git a/qa/workunits/mon/pool_ops.sh b/qa/workunits/mon/pool_ops.sh
index a9e9f422c40..2d346cc137f 100755
--- a/qa/workunits/mon/pool_ops.sh
+++ b/qa/workunits/mon/pool_ops.sh
@@ -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