From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Mar 2015 13:45:01 +0000 (-0700)
Subject: crushtool: improve straw2 compile/decompile test
X-Git-Tag: v0.94~48^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3923%2Fhead;p=ceph.git

crushtool: improve straw2 compile/decompile test

This way it catches #11079.

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

diff --git a/src/test/cli/crushtool/straw2.t b/src/test/cli/crushtool/straw2.t
index 8638dea5fb24..86813384072b 100644
--- a/src/test/cli/crushtool/straw2.t
+++ b/src/test/cli/crushtool/straw2.t
@@ -1,2 +1,4 @@
-  $ crushtool -c "$TESTDIR/straw2.txt" -o straw2
-  $ rm straw2
+  $ crushtool -c $TESTDIR/straw2.txt -o straw2
+  $ crushtool -d straw2 -o straw2.txt.new
+  $ diff -b $TESTDIR/straw2.txt straw2.txt.new
+  $ rm straw2 straw2.txt.new
diff --git a/src/test/cli/crushtool/straw2.txt b/src/test/cli/crushtool/straw2.txt
index 6a4a7e59fa8a..0928aa5b9297 100644
--- a/src/test/cli/crushtool/straw2.txt
+++ b/src/test/cli/crushtool/straw2.txt
@@ -15,27 +15,29 @@ type 2 default
 
 # buckets
 host host0 {
-        id -1           # do not change unnecessarily
-        # weight 1.000
-        alg straw2
-        hash 0  # rjenkins1
-        item device0 weight 1.000
+	id -1		# do not change unnecessarily
+	# weight 1.000
+	alg straw2
+	hash 0	# rjenkins1
+	item device0 weight 1.000
 }
 default default {
-        id -2           # do not change unnecessarily
-        # weight 1.000
-        alg straw2
-        hash 0  # rjenkins1
-        item host0 weight 1.000
+	id -2		# do not change unnecessarily
+	# weight 1.000
+	alg straw2
+	hash 0	# rjenkins1
+	item host0 weight 1.000
 }
 
 # rules
 rule replicated_ruleset {
-        ruleset 0
-        type replicated
-        min_size 1
-        max_size 10
-        step take default
-        step chooseleaf firstn 0 type host
-        step emit
+	ruleset 0
+	type replicated
+	min_size 1
+	max_size 10
+	step take default
+	step chooseleaf firstn 0 type host
+	step emit
 }
+
+# end crush map