beanstalk_integration_tests 0.0.4 → 0.0.5

data/README.md

@@ -1,4 +1,5 @@
 # BeanstalkIntegrationTests
+[![Gem Version](https://badge.fury.io/rb/beanstalk_integration_tests.png)](http://badge.fury.io/rb/beanstalk_integration_tests)
 
 A suite of integration tests to test adherence to the Beanstalkd protocol (https://github.com/kr/beanstalkd/blob/master/doc/protocol.md).
 

data/lib/beanstalk_integration_tests/reserve_test.rb

@@ -1,5 +1,4 @@
 require 'beanstalk_integration_tests/test_helper'
-require 'timeout'
 
 class ReserveTest < BeanstalkIntegrationTest
 

data/lib/beanstalk_integration_tests/test_helper.rb

@@ -9,7 +9,28 @@ require 'timeout'
 require 'beaneater'
 
 
+if RUBY_PLATFORM == 'java'
+  module Timeout
+    def timeout(sec, klass=nil)
+      return yield(sec) if sec == nil or sec.zero?
+      thread = Thread.new { yield(sec) }
+
+      if thread.join(sec).nil?
+        java_thread = JRuby.reference(thread)
+        thread.kill
+        java_thread.native_thread.interrupt
+        thread.join(0.15)
+        raise (klass || Error), 'execution expired'
+      else
+        thread.value
+      end
+    end
+  end
+end
+
+
 class BeanstalkIntegrationTest < MiniTest::Should::TestCase
+  include Timeout
 
   class << self
 
@@ -26,7 +47,11 @@ class BeanstalkIntegrationTest < MiniTest::Should::TestCase
   teardown do
     cleanup_tubes
     @clients.each do |client|
-      client.close unless client.connection.nil?
+      begin
+        client.close unless client.connection.nil?
+      rescue Errno::EBADF
+        # Timeouts in JRuby trash the client connection
+      end
     end
   end
 

data/lib/beanstalk_integration_tests/version.rb

@@ -1,3 +1,3 @@
 module BeanstalkIntegrationTests
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanstalk_integration_tests
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: