Permalink
Browse files

Get tests passing on jruby

  • Loading branch information...
1 parent 6492824 commit 3f4380d89119108eed516cda7d8164b11d555e33 @lantins committed Mar 9, 2012
Showing with 4 additions and 4 deletions.
  1. +4 −4 test/test_helper.rb
View
@@ -2,14 +2,14 @@
$LOAD_PATH.unshift dir + '/../lib'
$TESTING = true
-gem 'minitest'
+require 'rubygems'
require 'minitest/unit'
require 'minitest/pride'
require 'simplecov'
SimpleCov.start do
add_filter '/test/'
-end
+end unless RUBY_PLATFORM == 'java'
require 'resque-lock-timeout'
require dir + '/test_jobs'
@@ -31,8 +31,8 @@
pid = `ps -e -o pid,command | grep [r]edis-test`.split(' ')[0]
puts 'Killing test redis server...'
`rm -f #{dir}/dump.rdb`
- Process.kill('KILL', pid.to_i)
- exit exit_code
+ `kill -9 #{pid}`
+ exit(exit_code)
end
puts 'Starting redis for testing at localhost:9736...'

0 comments on commit 3f4380d

Please sign in to comment.