test-loop 10.0.0 → 10.0.1

data/lib/test/loop.rb

@@ -54,20 +54,22 @@ module Test
       @lines_by_file = {} # path => readlines
       @last_ran_at = @started_at = Time.now
 
-      catch self do
-        register_signals
-        load_user_config
-        absorb_overhead
-        run_test_loop
-      end
+      register_signals
+      load_user_config
+      absorb_overhead
+      run_test_loop
 
-      kill_workers
-      notify 'Goodbye!'
+    rescue Interrupt
+      # allow user to break the loop by pressing Ctrl-C or sending SIGINT
 
     rescue Exception => error
       STDERR.puts error.inspect, error.backtrace
       pause_momentarily
       reload_master_process
+
+    ensure
+      kill_workers
+      notify 'Goodbye!'
     end
 
     private
@@ -80,8 +82,10 @@ module Test
     ANSI_RED = "\e[31m%s\e[0m".freeze
 
     def notify message
-      # using print() because puts() is not an atomic operation
-      print "test-loop: #{message}\n"
+      # using print() because puts() is not an atomic operation.
+      # also, clear the line before printing because some shells emit
+      # text when control-key combos are pressed (to trigger signals)
+      print "#{ANSI_CLEAR_LINE}test-loop: #{message}\n"
     end
 
     def register_signals
@@ -89,11 +93,20 @@ module Test
       # workers can be killed by sending it to the entire process group
       trap :TERM, :IGNORE
 
-      # clear line to shield normal output from control-key interference:
-      # some shells like BASH emit text when control-key combos are pressed
-      trap(:INT)  { print ANSI_CLEAR_LINE; throw self }
-      trap(:QUIT) { print ANSI_CLEAR_LINE; reload_master_process }
-      trap(:TSTP) { print ANSI_CLEAR_LINE; forcibly_run_all_tests }
+      master_pid = $$
+      master_trap = lambda do |signal, &handler|
+        trap signal do
+          if $$ == master_pid
+            handler.call
+          else
+            # ignore future ocurrences of this signal in worker processes
+            trap signal, :IGNORE
+          end
+        end
+      end
+
+      master_trap.call(:QUIT) { reload_master_process }
+      master_trap.call(:TSTP) { forcibly_run_all_tests }
     end
 
     def kill_workers
@@ -183,8 +196,9 @@ module Test
       @lines_by_file[test_file] = new_lines
 
       worker_pid = fork do
-        # unregister custom signal handlers meant for master process
-        [:TERM, :INT, :QUIT, :TSTP].each {|sig| trap sig, :DEFAULT }
+        # this signal is ignored in master and honored in workers, so all
+        # workers can be killed by sending it to the entire process group
+        trap :TERM, :DEFAULT
 
         # capture test output in log file because tests are run in parallel
         # which makes it difficult to understand interleaved output thereof

metadata

@@ -2,7 +2,7 @@
 name: test-loop
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 10.0.0
+  version: 10.0.1
 platform: ruby
 authors: 
 - Suraj N. Kurapati
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -07:00
+date: 2011-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency