mon: fix crush unit tests for idempotency

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

diff --git a/qa/workunits/mon/crush_ops.sh b/qa/workunits/mon/crush_ops.sh
index 536c3d12934e98a9c0e2418e8d0ef186355c7fad..748d00bc3635a472fa7be431d3901799465494fb 100755 (executable)
--- a/qa/workunits/mon/crush_ops.sh
+++ b/qa/workunits/mon/crush_ops.sh
@@ -36,32 +36,27 @@ ceph osd tree | grep -c osd.$o1 | grep -q 2
 ceph osd tree | grep -c host1 | grep -q 2
 ceph osd tree | grep -c osd.$o2 | grep -q 2
 ceph osd tree | grep -c host2 | grep -q 2
-# FIXME: these should be idempotent!
 ceph osd crush rm host1 foo && exit 1 || true   # not empty
 ceph osd crush unlink host1 foo
-# FIXME: these should be idempotent!
-ceph osd crush unlink host1 foo && exit 1 || true # not there anymore
+ceph osd crush unlink host1 foo
 ceph osd tree | grep -c host1 | grep -q 1
 
-# FIXME: these should be idempotent!
-ceph osd crush rm foo && exit 1 || true
-ceph osd crush rm bar && exit 1 || true
+ceph osd crush rm foo  && exit 1 || true  # not empty
+ceph osd crush rm bar  && exit 1 || true  # not empty
 ceph osd crush unlink host1 bar
 ceph osd tree | grep -c host1 | grep -q 1   # now an orphan
 ceph osd crush rm osd.$o1 host1
 ceph osd crush rm host1
 ceph osd tree | grep -c host1 | grep -q 0
 
-# FIXME: these should be idempotent!
-ceph osd crush rm bar && exit 1 || true
+ceph osd crush rm bar && exit 1 || true   # not empty
 ceph osd crush unlink host2
 ceph osd crush rm bar
 ceph osd crush rm foo
 ceph osd crush rm osd.$o2 host2
 ceph osd crush rm host2
 
-# FIXME: these should be idempotent!
-ceph osd crush rm osd.$o1 && exit 1 || true
-ceph osd crush rm osd.$o2 && exit 1 || true
+ceph osd crush rm osd.$o1
+ceph osd crush rm osd.$o2
 
 echo OK