fixup! Enable test helper for all

AlexB52 · Dec 8, 2024 · c672bdd · c672bdd
1 parent 75c41ab
commit c672bdd
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 35 deletions.
diff --git a/features/bundler-app/retest/support/test_helper.rb b/features/bundler-app/retest/support/test_helper.rb
@@ -3,21 +3,18 @@
 
 module RetestHelper
   # COMMAND
-  def launch_retest(command, sleep_seconds: Float(ENV.fetch('LAUNCH_SLEEP_SECONDS', 1.5)))
+  def launch_retest(command, sleep_for: Float(ENV.fetch('LAUNCH_SLEEP_SECONDS', 1.5)))
     require 'open3'
     @input, @output, @stderr, @wait_thr = Open3.popen3(command)
     @pid = @wait_thr[:pid]
-    sleep sleep_seconds
+    sleep sleep_for
   end
 
   def end_retest
     @input&.close
     @stderr&.close
     @output&.close
-    if @pid
-      Process.kill('SIGHUP', @pid)
-      Process.detach(@pid)
-    end
+    @wait_thr.exit
   end
 
   # ASSERTIONS
@@ -42,7 +39,7 @@ def read_output(output = @output)
     result = ""
     loop do
       result += output.read_nonblock(1024)
-    rescue IO::WaitReadable
+    rescue IO::WaitReadable, EOFError
       break
     end
 

diff --git a/features/git-ruby/retest/support/test_helper.rb b/features/git-ruby/retest/support/test_helper.rb
@@ -3,21 +3,18 @@
 
 module RetestHelper
   # COMMAND
-  def launch_retest(command, sleep_seconds: Float(ENV.fetch('LAUNCH_SLEEP_SECONDS', 1.5)))
+  def launch_retest(command, sleep_for: Float(ENV.fetch('LAUNCH_SLEEP_SECONDS', 1.5)))
     require 'open3'
     @input, @output, @stderr, @wait_thr = Open3.popen3(command)
     @pid = @wait_thr[:pid]
-    sleep sleep_seconds
+    sleep sleep_for
   end
 
   def end_retest
     @input&.close
     @stderr&.close
     @output&.close
-    if @pid
-      Process.kill('SIGHUP', @pid)
-      Process.detach(@pid)
-    end
+    @wait_thr.exit
   end
 
   # ASSERTIONS

diff --git a/features/hanami-app/retest/support/test_helper.rb b/features/hanami-app/retest/support/test_helper.rb
@@ -3,21 +3,18 @@
 
 module RetestHelper
   # COMMAND
-  def launch_retest(command, sleep_seconds: Float(ENV.fetch('LAUNCH_SLEEP_SECONDS', 1.5)))
+  def launch_retest(command, sleep_for: Float(ENV.fetch('LAUNCH_SLEEP_SECONDS', 1.5)))
     require 'open3'
     @input, @output, @stderr, @wait_thr = Open3.popen3(command)
     @pid = @wait_thr[:pid]
-    sleep sleep_seconds
+    sleep sleep_for
   end
 
   def end_retest
     @input&.close
     @stderr&.close
     @output&.close
-    if @pid
-      Process.kill('SIGHUP', @pid)
-      Process.detach(@pid)
-    end
+    @wait_thr.exit
   end
 
   # ASSERTIONS

diff --git a/features/rails-app/retest/support/test_helper.rb b/features/rails-app/retest/support/test_helper.rb
@@ -14,10 +14,7 @@ def end_retest
     @input&.close
     @stderr&.close
     @output&.close
-    if @pid
-      Process.kill('SIGHUP', @pid)
-      Process.detach(@pid)
-    end
+    @wait_thr.exit
   end
 
   # ASSERTIONS

diff --git a/features/rspec-rails/retest/support/test_helper.rb b/features/rspec-rails/retest/support/test_helper.rb
@@ -14,10 +14,7 @@ def end_retest
     @input&.close
     @stderr&.close
     @output&.close
-    if @pid
-      Process.kill('SIGHUP', @pid)
-      Process.detach(@pid)
-    end
+    @wait_thr.exit
   end
 
   # ASSERTIONS

diff --git a/features/rspec-ruby/retest/support/test_helper.rb b/features/rspec-ruby/retest/support/test_helper.rb
@@ -14,10 +14,7 @@ def end_retest
     @input&.close
     @stderr&.close
     @output&.close
-    if @pid
-      Process.kill('SIGHUP', @pid)
-      Process.detach(@pid)
-    end
+    @wait_thr.exit
   end
 
   # ASSERTIONS

diff --git a/features/ruby-app/retest/support/test_helper.rb b/features/ruby-app/retest/support/test_helper.rb
@@ -14,10 +14,7 @@ def end_retest
     @input&.close
     @stderr&.close
     @output&.close
-    if @pid
-      Process.kill('SIGHUP', @pid)
-      Process.detach(@pid)
-    end
+    @wait_thr.exit
   end
 
   # ASSERTIONS