about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-04-27 21:23:58 +0000
committerEric Wong <e@80x24.org>2019-04-27 21:23:58 +0000
commitcd9baef52c4d6f03b6d474edf9863fd9bcfb6c31 (patch)
treecbbd403f4105693680b8f3a551d74187c619f3b8
parent8ad2972f425fa7ebbc46ae9cb95be613a86265b1 (diff)
downloadcmogstored-cd9baef52c4d6f03b6d474edf9863fd9bcfb6c31.tar.gz
Chasing down a regression in Linux 5.0:

	https://lkml.kernel.org/r/20190427093319.sgicqik2oqkez3wk@dcvr
-rw-r--r--test/mgmt_auto_adjust.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/mgmt_auto_adjust.rb b/test/mgmt_auto_adjust.rb
index 8ec725f..311747d 100644
--- a/test/mgmt_auto_adjust.rb
+++ b/test/mgmt_auto_adjust.rb
@@ -80,6 +80,7 @@ class TestMgmtAutoAdjust < Test::Unit::TestCase
          RUBY_PLATFORM !~ /kfreebsd-gnu/
 
   def test_aio_threads_auto_adjust_warn
+    at = Time.now
     @client.write "server aio_threads = 1\r\n"
     assert_equal "\r\n", @client.gets
     stop = Time.now + 60
@@ -87,7 +88,8 @@ class TestMgmtAutoAdjust < Test::Unit::TestCase
     while (! File.read(@err.path).include?(expect) && Time.now < stop)
       sleep 0.1
     end
-    assert(File.read(@err.path).include?(expect), File.read(@err.path))
+    msg = File.read(@err.path)
+    assert(msg.include?(expect), "msg[#@pid]: #{msg} #{at}")
 
     Dir.mkdir("#@tmpdir/dev333")
     warning = "fewer aio_threads(1) than devices(2)"
@@ -95,6 +97,7 @@ class TestMgmtAutoAdjust < Test::Unit::TestCase
     while (! File.read(@err.path).include?(warning)) && Time.now < stop
       sleep 0.1
     end
-    assert(File.read(@err.path).include?(warning), File.read(@err.path))
+    msg = File.read(@err.path)
+    assert(msg.include?(warning), "msg[#@pid]: #{msg} #{at}")
   end
 end