about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2012-06-29 20:33:10 +0000
committerEric Wong <normalperson@yhbt.net>2012-06-29 20:33:10 +0000
commit76ef95496eb5f38434c28b8080e08b668a8bf4f6 (patch)
tree8a9f013a46ffc00670f03a8eb7d9dc0a9b01c7e8
parent17128d5b73c8ad12f45c3888eded5d7a96a5e46a (diff)
downloadmogilefs-client-76ef95496eb5f38434c28b8080e08b668a8bf4f6.tar.gz
This is a boolean value on the server and we always try to
make our return values Ruby-friendly
-rw-r--r--lib/mogilefs/admin.rb6
-rw-r--r--test/fresh.rb7
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/mogilefs/admin.rb b/lib/mogilefs/admin.rb
index 2b3540a..06ba2a5 100644
--- a/lib/mogilefs/admin.rb
+++ b/lib/mogilefs/admin.rb
@@ -69,6 +69,12 @@ class MogileFS::Admin < MogileFS::Client
     rv.each do |row|
       u = row["utilization"] and
         row["utilization"] = nil == u ? nil : u.to_f
+      case row["reject_bad_md5"]
+      when "1"
+        row["reject_bad_md5"] = true
+      when "0"
+        row["reject_bad_md5"] = false
+      end
     end
   end
 
diff --git a/test/fresh.rb b/test/fresh.rb
index 7ccf3cf..f5eb1f9 100644
--- a/test/fresh.rb
+++ b/test/fresh.rb
@@ -132,6 +132,13 @@ EOF
     wait_for_usage_file "dev1"
     assert_equal true, @admin.create_device("me", 2)
     wait_for_usage_file "dev2"
+
+    # MogileFS::Server 2.60+ shows reject_bad_md5 monitor status
+    dev = @admin.get_devices[0]
+    if dev.include?("reject_bad_md5")
+      assert_include([true, false], dev["reject_bad_md5"])
+    end
+
     out = err = nil
     tries = 0
     begin