Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #3 from github/cleanup-broken-build

Cleanup broken build
  • Loading branch information...
commit 3a919c83d58d3e07bc9d7a10f5d00067a8c25e64 2 parents 2fd6326 + 6f664aa
@kdaigle kdaigle authored
View
2  Gemfile
@@ -7,7 +7,7 @@ group :test do
gem "rack-test", "~> 0.5"
gem "mocha", "~> 0.9.7"
gem "leftright", :platforms => :mri_18
- gem "yajl-ruby", "~>0.8.2", :platforms => :mri
+ gem "yajl-ruby", "~>1.1.0", :platforms => :mri
gem "json", "~>1.5.3", :platforms => [:jruby, :rbx]
gem "hoptoad_notifier"
gem "airbrake"
View
4 lib/resque/server/test_helper.rb
@@ -3,11 +3,11 @@
module Resque
module TestHelper
- class Test::Unit::TestCase
+ class ActiveSupport::TestCase
include Rack::Test::Methods
def app
Resque::Server.new
- end
+ end
def self.should_respond_with_success
test "should respond with success" do
View
7 test/redis-test.conf
@@ -106,10 +106,3 @@ databases 16
# errors for write operations, and this may even lead to DB inconsistency.
# maxmemory <bytes>
-
-############################### ADVANCED CONFIG ###############################
-
-# Glue small output buffers together in order to send small replies in a
-# single TCP packet. Uses a bit more CPU but most of the times it is a win
-# in terms of number of queries per second. Use 'yes' if unsure.
-glueoutputbuf yes
Please sign in to comment.
Something went wrong with that request. Please try again.