From: Sage Weil <sage@inktank.com>
Date: Wed, 26 Mar 2014 00:35:01 +0000 (-0700)
Subject: osd: fix tests due to no default erasure-code ruleset
X-Git-Tag: v0.79~89
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=18c3e9ec5375ee09e227b7d7fd94511ae9095b0e;p=ceph.git

osd: fix tests due to no default erasure-code ruleset

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

diff --git a/src/test/mon/osd-crush.sh b/src/test/mon/osd-crush.sh
index 38e2b19f1afb3..5f32f8cdf5464 100755
--- a/src/test/mon/osd-crush.sh
+++ b/src/test/mon/osd-crush.sh
@@ -89,9 +89,6 @@ function TEST_crush_rule_create_simple_exists() {
 
 function TEST_crush_rule_create_erasure() {
     local dir=$1
-    ./ceph --format xml osd crush rule dump erasure-code | \
-        egrep '<op>take</op><item>[^<]+</item><item_name>default</item_name>' | \
-        grep '<op>chooseleaf_indep</op><num>0</num><type>host</type>' || return 1
     local ruleset=ruleset3
     ./ceph osd crush rule create-erasure $ruleset || return 1
     ./ceph osd crush rule create-erasure $ruleset 2>&1 | \
diff --git a/src/test/mon/osd-pool-create.sh b/src/test/mon/osd-pool-create.sh
index 264583268851c..e260d9e1b94ee 100755
--- a/src/test/mon/osd-pool-create.sh
+++ b/src/test/mon/osd-pool-create.sh
@@ -75,9 +75,9 @@ function TEST_erasure_crush_rule() {
     ./ceph osd crush rule ls | grep $crush_ruleset
     local poolname
     poolname=pool_erasure1
-    ! ./ceph --format json osd dump | grep '"crush_ruleset":2' || return 1
+    ! ./ceph --format json osd dump | grep '"crush_ruleset":1' || return 1
     ./ceph osd pool create $poolname 12 12 erasure default $crush_ruleset
-    ./ceph --format json osd dump | grep '"crush_ruleset":2' || return 1
+    ./ceph --format json osd dump | grep '"crush_ruleset":1' || return 1
     #
     # a crush ruleset by the name of the pool is implicitly created
     #