Merge of doom

2012-06-07 14:40:55 +01:00
parent 5930f25034 40f0f9fab6
commit 1cd8f4660f
7 changed files with 78 additions and 51 deletions
--- a/tests/flexnbd.rb
+++ b/tests/flexnbd.rb
@@ -99,7 +99,8 @@ class FlexNBD
    IO.popen(cmd) do |fh|
      return fh.read
    end
-    raise "read failed" unless $?.success?
+    raise IOError.new "NBD read failed" unless $?.success?
+    out
  end

  def write(offset, data)
@@ -109,7 +110,7 @@ class FlexNBD
    IO.popen(cmd, "w") do |fh|
      fh.write(data)
    end
-    raise "write failed" unless $?.success?
+    raise IOError.new "NBD write failed" unless $?.success?
    nil
  end