skip forking tests for jruby

Author: hone

test/connection_pool_test.rb

@@ -59,6 +59,7 @@ module Resque
     end
 
     it 'is fork aware' do
+      skip if jruby?
       cp = ConnectionPool.new(REDIS_URL, 1)
       conn = cp.checkout
 

test/test_helper.rb

@@ -136,3 +136,7 @@ def now
 
   self.fake_time = nil
 end
+
+def jruby?
+  defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+end

test/worker_test.rb

@@ -468,75 +468,74 @@ def self.perform
     refute_equal original_connection, Resque.redis.client.connection.instance_variable_get("@sock")
   end
 
-  if !defined?(RUBY_ENGINE) || defined?(RUBY_ENGINE) && RUBY_ENGINE != "jruby"
-    [SignalException, Resque::TermException].each do |exception|
-      {
-        'cleanup occurs in allotted time' => nil,
-        'cleanup takes too long' => 2
-      }.each do |scenario,rescue_time|
-        it "SIGTERM when #{scenario} while catching #{exception}" do
-          begin
-            eval("class LongRunningJob; @@exception = #{exception}; end")
-            class LongRunningJob
-              @queue = :long_running_job
-
-              def self.perform( run_time, rescue_time=nil )
-                Resque.redis.client.reconnect # get its own connection
-                Resque.redis.rpush( 'sigterm-test:start', Process.pid )
-                sleep run_time
-                Resque.redis.rpush( 'sigterm-test:result', 'Finished Normally' )
-              rescue @@exception => e
-                Resque.redis.rpush( 'sigterm-test:result', %Q(Caught SignalException: #{e.inspect}))
-                sleep rescue_time unless rescue_time.nil?
-              ensure
-                Resque.redis.rpush( 'sigterm-test:final', 'exiting.' )
-              end
+  [SignalException, Resque::TermException].each do |exception|
+    {
+      'cleanup occurs in allotted time' => nil,
+      'cleanup takes too long' => 2
+    }.each do |scenario,rescue_time|
+      it "SIGTERM when #{scenario} while catching #{exception}" do
+        skip if jruby?
+        begin
+          eval("class LongRunningJob; @@exception = #{exception}; end")
+          class LongRunningJob
+            @queue = :long_running_job
+
+            def self.perform( run_time, rescue_time=nil )
+              Resque.redis.client.reconnect # get its own connection
+              Resque.redis.rpush( 'sigterm-test:start', Process.pid )
+              sleep run_time
+              Resque.redis.rpush( 'sigterm-test:result', 'Finished Normally' )
+            rescue @@exception => e
+              Resque.redis.rpush( 'sigterm-test:result', %Q(Caught SignalException: #{e.inspect}))
+              sleep rescue_time unless rescue_time.nil?
+            ensure
+              Resque.redis.rpush( 'sigterm-test:final', 'exiting.' )
             end
+          end
 
-            Resque.enqueue( LongRunningJob, 5, rescue_time )
-
-            worker_pid = Kernel.fork do
-              # ensure we actually fork
-              $TESTING = false
-              # reconnect since we just forked
-              Resque.redis.client.reconnect
+          Resque.enqueue( LongRunningJob, 5, rescue_time )
 
-              worker = Resque::Worker.new(:long_running_job)
-              worker.term_timeout = 1
+          worker_pid = Kernel.fork do
+            # ensure we actually fork
+            $TESTING = false
+            # reconnect since we just forked
+            Resque.redis.client.reconnect
 
-              worker.work(0)
-              exit!
-            end
+            worker = Resque::Worker.new(:long_running_job)
+            worker.term_timeout = 1
 
-            # ensure the worker is started
-            start_status = Resque.redis.blpop( 'sigterm-test:start', 5 )
-            refute_nil start_status
-            child_pid = start_status[1].to_i
-            assert_operator child_pid, :>, 0
-
-            # send signal to abort the worker
-            Process.kill('TERM', worker_pid)
-            Process.waitpid(worker_pid)
-
-            # wait to see how it all came down
-            result = Resque.redis.blpop( 'sigterm-test:result', 5 )
-            refute_nil result
-            assert !result[1].start_with?('Finished Normally'), 'Job Finished normally. Sleep not long enough?'
-            assert result[1].start_with? 'Caught SignalException', 'Signal exception not raised in child.'
-
-            # ensure that the child pid is no longer running
-            child_still_running = !(`ps -p #{child_pid.to_s} -o pid=`).empty?
-            assert !child_still_running
-
-            # see if post-cleanup occurred. This should happen IFF the rescue_time is less than the term_timeout
-            post_cleanup_occurred = Resque.redis.lpop( 'sigterm-test:final' )
-            assert post_cleanup_occurred, 'post cleanup did not occur. SIGKILL sent too early?' if rescue_time.nil?
-            assert !post_cleanup_occurred, 'post cleanup occurred. SIGKILL sent too late?' unless rescue_time.nil?
-
-          ensure
-            remaining_keys = Resque.redis.keys('sigterm-test:*') || []
-            Resque.redis.del(*remaining_keys) unless remaining_keys.empty?
+            worker.work(0)
+            exit!
           end
+
+          # ensure the worker is started
+          start_status = Resque.redis.blpop( 'sigterm-test:start', 5 )
+          refute_nil start_status
+          child_pid = start_status[1].to_i
+          assert_operator child_pid, :>, 0
+
+          # send signal to abort the worker
+          Process.kill('TERM', worker_pid)
+          Process.waitpid(worker_pid)
+
+          # wait to see how it all came down
+          result = Resque.redis.blpop( 'sigterm-test:result', 5 )
+          refute_nil result
+          assert !result[1].start_with?('Finished Normally'), 'Job Finished normally. Sleep not long enough?'
+          assert result[1].start_with? 'Caught SignalException', 'Signal exception not raised in child.'
+
+          # ensure that the child pid is no longer running
+          child_still_running = !(`ps -p #{child_pid.to_s} -o pid=`).empty?
+          assert !child_still_running
+
+          # see if post-cleanup occurred. This should happen IFF the rescue_time is less than the term_timeout
+          post_cleanup_occurred = Resque.redis.lpop( 'sigterm-test:final' )
+          assert post_cleanup_occurred, 'post cleanup did not occur. SIGKILL sent too early?' if rescue_time.nil?
+          assert !post_cleanup_occurred, 'post cleanup occurred. SIGKILL sent too late?' unless rescue_time.nil?
+
+        ensure
+          remaining_keys = Resque.redis.keys('sigterm-test:*') || []
+          Resque.redis.del(*remaining_keys) unless remaining_keys.empty?
         end
       end
     end