crushtool: fix clitest now that --force is gone

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

diff --git a/src/test/cli/crushtool/exhaustive-search.t b/src/test/cli/crushtool/exhaustive-search.t
index c0815c60f4be70bd22626e54e76798e0248b8af5..7256bcd72c60a73fb7d409f24c097cb8fe317386 100644 (file)
--- a/src/test/cli/crushtool/exhaustive-search.t
+++ b/src/test/cli/crushtool/exhaustive-search.t
@@ -1,72 +1,72 @@
 # This detects the incorrect mapping (due to off by one error in
 # linear search) that caused #1594
-  $ crushtool -i "$TESTDIR/five-devices.crushmap" --test --x 3 --rule 2 --force 3 -v --weight 1 0 --weight 2 0 --weight 4 0
+  $ crushtool -i "$TESTDIR/five-devices.crushmap" --test --x 3 --rule 2 -v --weight 1 0 --weight 2 0 --weight 4 0
   devices weights (hex): [10000,0,0,10000,0]
   rule 2 (rbd), x = 3..3, numrep = 1..10
-   rule 2 x 3 [3]
-    device 0:\t0 (esc)
+   rule 2 x 3 [0]
+    device 0:\t1 (esc)
     device 1:\t0 (esc)
     device 2:\t0 (esc)
-    device 3:\t1 (esc)
+    device 3:\t0 (esc)
     device 4:\t0 (esc)
   rule 2 (rbd) num_rep 1 result size == 1:\t1/1 (esc)
-   rule 2 x 3 [3,0]
+   rule 2 x 3 [0,3]
     device 0:\t1 (esc)
     device 1:\t0 (esc)
     device 2:\t0 (esc)
     device 3:\t1 (esc)
     device 4:\t0 (esc)
   rule 2 (rbd) num_rep 2 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [3,0]
+   rule 2 x 3 [0,3]
     device 0:\t1 (esc)
     device 1:\t0 (esc)
     device 2:\t0 (esc)
     device 3:\t1 (esc)
     device 4:\t0 (esc)
   rule 2 (rbd) num_rep 3 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [3,0]
+   rule 2 x 3 [0,3]
     device 0:\t1 (esc)
     device 1:\t0 (esc)
     device 2:\t0 (esc)
     device 3:\t1 (esc)
     device 4:\t0 (esc)
   rule 2 (rbd) num_rep 4 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [3,0]
+   rule 2 x 3 [0,3]
     device 0:\t1 (esc)
     device 1:\t0 (esc)
     device 2:\t0 (esc)
     device 3:\t1 (esc)
     device 4:\t0 (esc)
   rule 2 (rbd) num_rep 5 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [3,0]
+   rule 2 x 3 [0,3]
     device 0:\t1 (esc)
     device 1:\t0 (esc)
     device 2:\t0 (esc)
     device 3:\t1 (esc)
     device 4:\t0 (esc)
   rule 2 (rbd) num_rep 6 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [3,0]
+   rule 2 x 3 [0,3]
     device 0:\t1 (esc)
     device 1:\t0 (esc)
     device 2:\t0 (esc)
     device 3:\t1 (esc)
     device 4:\t0 (esc)
   rule 2 (rbd) num_rep 7 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [3,0]
+   rule 2 x 3 [0,3]
     device 0:\t1 (esc)
     device 1:\t0 (esc)
     device 2:\t0 (esc)
     device 3:\t1 (esc)
     device 4:\t0 (esc)
   rule 2 (rbd) num_rep 8 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [3,0]
+   rule 2 x 3 [0,3]
     device 0:\t1 (esc)
     device 1:\t0 (esc)
     device 2:\t0 (esc)
     device 3:\t1 (esc)
     device 4:\t0 (esc)
   rule 2 (rbd) num_rep 9 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [3,0]
+   rule 2 x 3 [0,3]
     device 0:\t1 (esc)
     device 1:\t0 (esc)
     device 2:\t0 (esc)