From: Sage Weil <sage@redhat.com>
Date: Wed, 31 May 2017 13:44:27 +0000 (-0400)
Subject: test/cli/crushtool: adjust tests
X-Git-Tag: ses5-milestone6~9^2~40^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=495f4c9dd7eae78730021293beafc0dc89296068;p=ceph.git

test/cli/crushtool: adjust tests

Specify chooseleaf_stable for --build tests to match prior output.

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

diff --git a/src/test/cli/crushtool/arg-order-checks.t b/src/test/cli/crushtool/arg-order-checks.t
index 5c8b6ab02780b..3b4baf7fb749f 100644
--- a/src/test/cli/crushtool/arg-order-checks.t
+++ b/src/test/cli/crushtool/arg-order-checks.t
@@ -4,7 +4,7 @@
   tunable straw_calc_version 1
 # build then reweight-item then tree
   $ map="$TESTDIR/foo"
-  $ crushtool --outfn "$map" --build --set-chooseleaf-vary-r 0 --num_osds 25 node straw 5 rack straw 1 root straw 0 --reweight-item osd.2 99 -o "$map" --tree
+  $ crushtool --outfn "$map" --build --set-chooseleaf-vary-r 0 --set-chooseleaf-stable 0 --num_osds 25 node straw 5 rack straw 1 root straw 0 --reweight-item osd.2 99 -o "$map" --tree
   crushtool reweighting item osd.2 to 99
   ID\tWEIGHT\tTYPE NAME (esc)
   -11\t123.00000\troot root (esc)
diff --git a/src/test/cli/crushtool/build.t b/src/test/cli/crushtool/build.t
index 0a779f0f4f926..a941307f0053a 100644
--- a/src/test/cli/crushtool/build.t
+++ b/src/test/cli/crushtool/build.t
@@ -23,7 +23,7 @@
 #
 # crush rulesets are generated using the OSDMap helpers
 #
-  $ CEPH_ARGS="--debug-crush 0" crushtool --outfn "$map" --set-straw-calc-version 0 --build --num_osds 1 root straw 0
+  $ CEPH_ARGS="--debug-crush 0" crushtool --outfn "$map" --set-straw-calc-version 0 --build --num_osds 1 root straw 0 --set-chooseleaf-stable 0
   $ crushtool -o "$map.txt" -d "$map"
   $ cat "$map.txt"
   # begin crush map