[PATCH] test/mgmt: relax checks for iostat mapping

[PATCH] test/mgmt: relax checks for iostat mapping

[Eric Wong]

In the age of virtualized devices and fast solid-state storage,
iostat information isn't as useful at it was a decade ago and
probably less useful in tests.  So relax the tests.
---
 test/mgmt.rb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/mgmt.rb b/test/mgmt.rb
index 64f7bfc..28ef255 100644
--- a/test/mgmt.rb
+++ b/test/mgmt.rb
@@ -347,7 +347,11 @@ class TestMgmt < Test::Unit::TestCase
       break if str =~ /^666\t/
     end
     util = RUBY_PLATFORM =~ /linux/ ? %r{\d+\.\d\d} : %r{\d+(?:\.\d+)?}
-    assert_match(/^666\t#{util}\n/, str, swarn(str.inspect))
+    if str =~ /^666\t-\n/
+      warn "'watch' may not work correctly on virtual disks\n"
+    else
+      assert_match(/^666\t#{util}\n/, str, swarn(str.inspect))
+    end
     assert_equal ".\n", @client.gets
   end if `which iostat 2>/dev/null`.chomp.size != 0 &&
          RUBY_PLATFORM !~ /kfreebsd-gnu/
@@ -363,8 +367,12 @@ class TestMgmt < Test::Unit::TestCase
     lines = []
     lines << @client.gets
     lines << @client.gets
-    assert_match(/^(666|999)\t#{util}\n/, lines[0], swarn(lines.inspect))
-    assert_match(/^(666|999)\t#{util}\n/, lines[1], swarn(lines.inspect))
+    if lines.grep(/^(666|999)\t-\n/)[0]
+      warn "'watch' may not work correctly on virtual disks\n"
+    else
+      assert_match(/^(666|999)\t#{util}\n/, lines[0], swarn(lines.inspect))
+      assert_match(/^(666|999)\t#{util}\n/, lines[1], swarn(lines.inspect))
+    end
     assert_not_equal(lines[0], lines[1])
 
     assert_equal ".\n", @client.gets
-- 
EW