CI - itermittent fix and RuboCop (puma#2741)

* test_thread_pool.rb - newer RuboCop fixes * test_cli.rb - fix intermittent darwin error
JuanitoFatas · Sep 9, 2022 · d2f417d · d2f417d
1 parent 79f3f6d
commit d2f417d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/test/test_cli.rb b/test/test_cli.rb
@@ -26,6 +26,9 @@ def setup
 
   def wait_booted
     @wait.sysread 1
+  rescue Errno::EAGAIN
+    sleep 0.001
+    retry
   end
 
   def teardown

diff --git a/test/test_thread_pool.rb b/test/test_thread_pool.rb
@@ -145,8 +145,7 @@ def test_autotrim
     end
 
     start = Time.now
-    Thread.pass until pool.spawned == 1 ||
-      Time.now - start > 1
+    Thread.pass until pool.spawned == 1 || Time.now - start > 1
 
     assert_equal 1, pool.spawned
   end
@@ -211,8 +210,7 @@ def test_auto_reap_dead_threads
     pool << 2
 
     start = Time.now
-    Thread.pass until pool.spawned == 0 ||
-      Time.now - start > 1
+    Thread.pass until pool.spawned == 0 || Time.now - start > 1
 
     assert_equal 0, pool.spawned
   end